fix transferttype + wallet history

src/pages/wallet/wallet-history/blocks/ListToolbar.tsx

@@ -19,6 +19,13 @@ interface WalletProps {
   name: string;
 }
 
+const getOneMonthsAgo = () => {
+  const today = new Date();
+  return new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
+};
+
+const formatDate = (date: Date): string => date.toISOString().split('T')[0];
+
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { GetData } = useCallApi();
@@ -32,12 +39,10 @@ const ListToolbar = () => {
   );
   const [wallets, setWallets] = useState<WalletProps[]>([]);
 
-  const formatDate = (date: Date): string => date.toISOString().split('T')[0];
-
   useEffect(() => {
     const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-    setDateRange({ from: formatDate(firstDayOfMonth), to: formatDate(today) });
+    const threeMonthsAgo = getOneMonthsAgo();
+    setDateRange({ from: formatDate(threeMonthsAgo), to: formatDate(today) });
   }, []);
 
   useEffect(() => {
@@ -45,7 +50,6 @@ const ListToolbar = () => {
       table.getColumn('msisdn')?.setFilterValue(searchValue);
       table.setPageIndex(0);
     }, 200);
-
     return () => clearTimeout(timer);
   }, [searchValue, table]);
 
@@ -89,35 +93,49 @@ const ListToolbar = () => {
   }, []);
 
   const handleClearAllFilters = () => {
+    const today = new Date();
+    const threeMonthsAgo = getOneMonthsAgo();
+    const resetDateRange = {
+      from: formatDate(threeMonthsAgo),
+      to: formatDate(today)
+    };
+
     setSearchValue('');
     setWalletId('');
+    setDateRange(resetDateRange);
 
-    const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
-    setDateRange({
-      from: formatDate(firstDayOfMonth),
-      to: formatDate(today)
-    });
-
-    table.getAllColumns().forEach((column) => {
-      if (column.id !== 'CreatedAt') {
-        column.setFilterValue(undefined);
-      }
-    });
+    // table.getAllColumns().forEach((column) => {
+    //   if (column.id !== 'CreatedAt') {
+    //     column.setFilterValue(undefined);
+    //   }
+    // });
 
+    table.getColumn('CreatedAt')?.setFilterValue(resetDateRange);
     table.setPageIndex(0);
+  };
 
-    table.getColumn('CreatedAt')?.setFilterValue({
-      from: formatDate(firstDayOfMonth),
+  const handleRefresh = () => {
+    const today = new Date();
+    const threeMonthsAgo = getOneMonthsAgo();
+    const resetDateRange = {
+      from: formatDate(threeMonthsAgo),
       to: formatDate(today)
-    });
+    };
+
+    setSearchValue('');
+    setWalletId('');
+    setDateRange(resetDateRange);
+
+    table.setColumnFilters([{ id: 'CreatedAt', value: resetDateRange }]);
+    table.setPageIndex(0);
+    reload();
   };
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
       <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
         <div className="flex justify-between w-full items-center">
-          <div className="flex gap-3 items-center flex-wrap">
+          <div className="flex flex-wrap items-end gap-3 w-full">
             <label className="input input-sm w-[160px]">
               From
               <input
@@ -146,14 +164,9 @@ const ListToolbar = () => {
               />
             </label>
 
-            <div className="w-[220px]">
-              <Select
-                value={walletId}
-                onValueChange={(value) => {
-                  setWalletId(value);
-                }}
-              >
-                <SelectTrigger>
+            <div className="w-[160px]">
+              <Select value={walletId} onValueChange={(value) => setWalletId(value)}>
+                <SelectTrigger className="h-[32px]">
                   <SelectValue placeholder="Select Wallet" />
                 </SelectTrigger>
                 <SelectContent>
@@ -165,25 +178,14 @@ const ListToolbar = () => {
                 </SelectContent>
               </Select>
             </div>
-
-            <Button variant="outline" size="sm" onClick={handleClearAllFilters}>
-              Clear Filter
-            </Button>
           </div>
 
           <div className="flex gap-3 items-center">
+            <Button variant="outline" size="sm" onClick={handleClearAllFilters}>
+              Clear
+            </Button>
             <DefaultTooltip title={'Refresh'} placement={'top'}>
-              <Button
-                variant="outline"
-                className="h-7.5"
-                onClick={() => {
-                  setSearchValue('');
-                  setWalletId('');
-                  table.setColumnFilters((prev) => prev.filter((f) => f.id === 'CreatedAt'));
-                  table.setPageIndex(0);
-                  reload();
-                }}
-              >
+              <Button variant="outline" className="h-7.5" onClick={handleRefresh}>
                 <KeenIcon icon="arrows-circle" />
               </Button>
             </DefaultTooltip>