diff --git a/src/pages/dashboards/home/blocks/ShowDetailWalletDialog.tsx b/src/pages/dashboards/home/blocks/ShowDetailWalletDialog.tsx index c4ec9ad..654817c 100644 --- a/src/pages/dashboards/home/blocks/ShowDetailWalletDialog.tsx +++ b/src/pages/dashboards/home/blocks/ShowDetailWalletDialog.tsx @@ -102,11 +102,26 @@ const ShowDetailWalletDialog: React.FC = ({ const handleApplyFilters = () => { const appliedFilters: any = {}; - if (dateRange.from) appliedFilters.date_from = dateRange.from+" 00:00:00"; - if (dateRange.to) appliedFilters.date_to = dateRange.to+" 23:59:59"; - if (selectedTransferType) appliedFilters.transaction_type_id = selectedTransferType; - if (selectedCategory) appliedFilters.category = selectedCategory; - if (searchValue) appliedFilters.transaction_code = searchValue; + if (dateRange.from && dateRange.to) { + const fromDate = new Date(`${dateRange.from}T00:00:00Z`); + const toDate = new Date(`${dateRange.to}T23:59:59Z`); + appliedFilters.date = { + from: fromDate.toISOString(), + to: toDate.toISOString(), + }; + } + + if (selectedTransferType) { + appliedFilters.transaction_type_id = selectedTransferType; + } + + if (selectedCategory) { + appliedFilters.category = selectedCategory; + } + + if (searchValue) { + appliedFilters.transaction_code = searchValue; + } setFilters(appliedFilters); }; @@ -207,7 +222,7 @@ const ShowDetailWalletDialog: React.FC = ({ with_deleted: false, order_field: "created_at", order_direction: 'DESC', - filter: filters + filter: JSON.stringify(filters) }); // console.log(filters);