Skip to content

Commit 98df6ad

Browse files
committed
#2082 using just formData in the hook
1 parent 9a917a3 commit 98df6ad

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

src/frontend/src/hooks/finance.hooks.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,18 +342,16 @@ export const useDenyReimbursementRequest = (id: string) => {
342342
* @param fileIds The google file ids to fetch the images for
343343
*/
344344
export const useDownloadPDFOfImages = () => {
345-
return useMutation(['reimbursement-requests'], async (formData: { requestData: DownloadReceiptsFormInput }) => {
346-
const promises = formData.requestData.fileIds.map((fileId) => {
345+
return useMutation(['reimbursement-requests'], async (formData: DownloadReceiptsFormInput) => {
346+
const promises = formData.fileIds.map((fileId) => {
347347
return downloadGoogleImage(fileId);
348348
});
349349

350350
const blobs = await Promise.all(promises);
351-
const pdfName = `${formData.requestData.startDate.toLocaleDateString()}-${formData.requestData.endDate.toLocaleDateString()}.pdf`;
351+
const pdfName = `${formData.startDate.toLocaleDateString()}-${formData.endDate.toLocaleDateString()}.pdf`;
352352

353353
const pdfFileName =
354-
formData.requestData.refundSource !== 'BOTH'
355-
? `receipts-${formData.requestData.refundSource}-${pdfName}`
356-
: `receipts-${pdfName}`;
354+
formData.refundSource !== 'BOTH' ? `receipts-${formData.refundSource}-${pdfName}` : `receipts-${pdfName}`;
357355

358356
await downloadBlobsToPdf(blobs, pdfFileName);
359357
});

src/frontend/src/pages/FinancePage/FinanceComponents/GenerateReceiptsModal.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,10 @@ const GenerateReceiptsModal = ({ open, setOpen, allReimbursementRequests }: Gene
5858

5959
try {
6060
await mutateAsync({
61-
requestData: {
62-
fileIds: receipts.map((receipt) => receipt.googleFileId),
63-
startDate: data.startDate,
64-
endDate: data.endDate,
65-
refundSource: data.refundSource
66-
}
61+
fileIds: receipts.map((receipt) => receipt.googleFileId),
62+
startDate: data.startDate,
63+
endDate: data.endDate,
64+
refundSource: data.refundSource
6765
});
6866
} catch (error: unknown) {
6967
if (error instanceof Error) {

0 commit comments

Comments
 (0)