From 6c49de9e4a5d8addd3b6d614bf8a045186322be3 Mon Sep 17 00:00:00 2001
From: bagusajisaputroo <bagusajisaputro21@gmail.com>
Date: Fri, 2 May 2025 14:44:58 +0700
Subject: [PATCH 01/15] fixing clear filter transfer type

---
 .../transfertype/blocks/ListToolBar.tsx       | 175 ++++++++----------
 .../hooks/ManageTransferTypeContext.tsx       |   2 +-
 2 files changed, 80 insertions(+), 97 deletions(-)

diff --git a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
index c1c116c..d57d2a4 100644
--- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
+++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
@@ -23,6 +23,31 @@ interface TransferType {
 
 const API_URL = apiConfig.service_transaction;
 
+const typeLabelMap: Record<string, string> = {
+  D: 'Disbursement',
+  O: 'Other',
+  CA: 'Change Group Emoney Customer to Agent',
+  AC: 'Change Group Emoney Agent to Customer',
+  PC: 'Change Group Point Agent to Customer',
+  PA: 'Change Group Point Customer to Agent',
+  CE: 'Return Customer Emoney',
+  AD: 'Return Agent Deposit',
+  AM: 'Return Agent Merchant',
+  AE: 'Return Agent Emoney',
+  R: 'Reward Point',
+  TE: 'Top Up Escrow',
+  TM: 'Top Up Master Agent',
+  TA: 'Top Up Agent',
+  PL: 'Purchase Loja',
+  DE: 'Disbursment Escrow',
+  DM: 'Disbursment Master Agent',
+  DA: 'Disbursment Agent',
+  WI: 'Withdraw Merchant',
+  IC: 'Income Merchant'
+};
+
+// Import section remains the same...
+
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog } = useManageTransferTypeContext();
@@ -31,40 +56,10 @@ const ListToolbar = () => {
 
   const [searchValue, setSearchValue] = useState('');
   const [statusTypes, setStatusTypes] = useState('');
-  const [walletOrigins, setWalletOrigin] = useState('');
-  const [walletDestinations, setWalletDestination] = useState('');
   const [approval, setApproval] = useState('');
 
   const unique = (arr: string[]) => Array.from(new Set(arr));
   const types = unique(transferTypes.map((t) => t.type));
-  const origins = unique(transferTypes.map((t) => t.wallet_origin.name));
-  const destinations = unique(transferTypes.map((t) => t.wallet_destination.name));
-  const typeLabelMap: Record<string, string> = {
-    D: 'Disbursement',
-    O: 'Other',
-    CA: 'Change Group Emoney Customer to Agent',
-    AC: 'Change Group Emoney Agent to Customer',
-    PC: 'Change Group Point Agent to Customer',
-    PA: 'Change Group Point Customer to Agent',
-    CE: 'Return Customer Emoney',
-    AD: 'Return Agent Deposit',
-    AM: 'Return Agent Merchant',
-    AE: 'Return Agent Emoney',
-    R: 'Reward Point',
-    TE: 'Top Up Escrow',
-    TM: 'Top Up Master Agent',
-    TA: 'Top Up Agent',
-    PL: 'Purchase Loja',
-    DE: 'Disbursment Escrow',
-    DM: 'Disbursment Master Agent',
-    DA: 'Disbursment Agent',
-    WI: 'Withdraw Merchant',
-    IC: 'Income Merchant'
-  };
-  const approvalLabelMap: Record<string, string> = {
-    Y: 'Yes',
-    N: 'No'
-  };
 
   useEffect(() => {
     const timer = setTimeout(() => {
@@ -78,18 +73,6 @@ const ListToolbar = () => {
     table.getColumn('type')?.setFilterValue(statusTypes);
   }, [statusTypes]);
 
-  useEffect(() => {
-    table
-      .getColumn('wallet_origin')
-      ?.setFilterValue(walletOrigins === '__all__' ? '' : walletOrigins);
-  }, [walletOrigins]);
-
-  useEffect(() => {
-    table
-      .getColumn('wallet_destination')
-      ?.setFilterValue(walletDestinations === '__all__' ? '' : walletDestinations);
-  }, [walletDestinations]);
-
   useEffect(() => {
     table.getColumn('status_approval')?.setFilterValue(approval);
   }, [approval]);
@@ -114,46 +97,30 @@ const ListToolbar = () => {
   }, []);
 
   const handleClearFilter = () => {
+    // Reset state variables
     setSearchValue('');
-    setStatusTypes('__all__');
-    setWalletOrigin('__all__');
-    setWalletDestination('__all__');
-    setApproval('__all__');
+    setStatusTypes('');
+    setApproval('');
+
+    // Clear all column filters
     table.getColumn('name')?.setFilterValue('');
     table.getColumn('type')?.setFilterValue('');
-    table.getColumn('wallet_origin')?.setFilterValue('');
-    table.getColumn('wallet_destination')?.setFilterValue('');
     table.getColumn('status_approval')?.setFilterValue('');
-    table.setPageIndex(0);
-  };
 
-  const renderSelect = (
-    placeholder: string,
-    value: string,
-    onChange: (val: string) => void,
-    options: string[],
-    labelMap?: Record<string, string>
-  ) => (
-    <div className="min-w-[220px]">
-      <Select value={value === '' ? undefined : value} onValueChange={onChange}>
-        <SelectTrigger className="h-8 text-sm">
-          <SelectValue placeholder={placeholder} />
-        </SelectTrigger>
-        <SelectContent>
-          {options.map((opt) => (
-            <SelectItem key={opt} value={opt}>
-              {labelMap?.[opt] ?? opt}
-            </SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
-    </div>
-  );
-  
+    // Force reset the Select components by using setTimeout
+    // This ensures the state updates are processed before resetting the UI
+    setTimeout(() => {
+      // Reset to first page
+      table.setPageIndex(0);
+      // Reload the data
+      reload();
+    }, 0);
+  };
 
   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">
+        {/* Top bar */}
         <div className="flex justify-between w-full items-center mb-3">
           <div className="flex w-[34%] gap-2 items-center">
             <label className="input input-sm w-full text-sm">
@@ -188,30 +155,46 @@ const ListToolbar = () => {
 
         {/* Filter bar */}
         <div className="flex flex-wrap gap-2 w-full">
-          {renderSelect(
-            'Select Status Transaction Type',
-            statusTypes,
-            setStatusTypes,
-            types,
-            typeLabelMap
-          )}
-          {renderSelect(
-            'Select Status Approval',
-            approval,
-            setApproval,
-            ['Y', 'N'],
-            approvalLabelMap
-          )}
-          {/* {renderSelect('Select Origin Wallet', walletOrigins, setWalletOrigin, origins)}
-          {renderSelect(
-            'Select Destination Wallet',
-            walletDestinations,
-            setWalletDestination,
-            destinations
-          )} */}
+          {/* Type Filter */}
+          <div className="min-w-[220px]">
+            <Select
+              key={`type-filter-${statusTypes}`}
+              value={statusTypes}
+              onValueChange={setStatusTypes}
+            >
+              <SelectTrigger className="h-8 text-sm">
+                <SelectValue placeholder="Select Status Transaction Type" />
+              </SelectTrigger>
+              <SelectContent className="w-[var(--radix-select-trigger-width)] max-h-64 overflow-y-auto">
+                {types.map((opt) => (
+                  <SelectItem key={opt} value={opt} className="truncate">
+                    {typeLabelMap[opt] ?? opt}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
 
-          {/* {renderSelect('Origin', walletOrigins, setWalletOrigin, origins)}
-          {renderSelect('Destination', walletDestinations, setWalletDestination, destinations)} */}
+          {/* Approval Filter */}
+          <div className="min-w-[220px]">
+            <Select
+              key={`approval-filter-${approval}`}
+              value={approval}
+              onValueChange={setApproval}
+            >
+              <SelectTrigger className="h-8 text-sm">
+                <SelectValue placeholder="Select Status Approval" />
+              </SelectTrigger>
+              <SelectContent className="w-[var(--radix-select-trigger-width)] max-h-64 overflow-y-auto">
+                <SelectItem value="Y" className="truncate">
+                  Yes
+                </SelectItem>
+                <SelectItem value="N" className="truncate">
+                  No
+                </SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
index 8ae1aed..0d7982a 100644
--- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
+++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
@@ -325,7 +325,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
       order_direction: orderDirection,
       filter: JSON.stringify(filterObject)
     });
-    // console.log(response);
+    console.log(response);
     return { data: response?.data.list, totalCount: response?.data.total_count };
   };
 

From c596f1b6007d1850ed5ec82291748ff8f71fb373 Mon Sep 17 00:00:00 2001
From: benhur <benhurnainggolan2@gmail.com>
Date: Fri, 2 May 2025 15:47:04 +0800
Subject: [PATCH 02/15] revert 94f6d65dfea10accf6c99b87fe23f1160011369a

revert fix detail member
---
 package-lock.json                             |  11 -
 .../manage-members/blocks/DetailMember.tsx    |   3 +-
 yarn.lock                                     | 458 +++++++++---------
 3 files changed, 228 insertions(+), 244 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f10a96..50a3b44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -74,7 +74,6 @@
         "styled-components": "^6.1.13",
         "stylis": "^4.3.4",
         "stylis-plugin-rtl": "^2.1.1",
-        "sweetalert2": "^11.19.1",
         "tabs": "^0.2.0",
         "tailwind-merge": "^2.5.4",
         "tailwindcss-animate": "^1.0.7",
@@ -9041,16 +9040,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/sweetalert2": {
-      "version": "11.19.1",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.19.1.tgz",
-      "integrity": "sha512-+8yws3Sc1srAZbrgdhmEIZny1I1UOYhJOIOdtOlv4TYaP5kkwQ9Zm8/BT23Qg+KdByCNOazltxEJAHzXVu8mhA==",
-      "license": "MIT",
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/sponsors/limonte"
-      }
-    },
     "node_modules/synckit": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx
index d7e963c..ffb4efc 100644
--- a/src/pages/members/manage-members/blocks/DetailMember.tsx
+++ b/src/pages/members/manage-members/blocks/DetailMember.tsx
@@ -65,7 +65,7 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
     const handleChange = async (e: any) => {
         const { name, value } = e.target;
         if (name === "file_selfie" || name === "photouser" || name === 'file_document_id' || name === "file_document_id_selfie" ||
-          name === "file_commercial_license" || name === 'photomerchant') { // FOR FILE ONLY
+          name === "file_commercial_license") { // FOR FILE ONLY
           setFormData({ ...formData, [name]: e.target.files[0] });
         } else if(name === "nationality") {
             setFormData({ ...formData, [name]: value });
@@ -258,7 +258,6 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
                                 {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Merchant Address', 'merchantaddress', 'text', false, viewOnly): ''}
                                 {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Longitude Merchant', 'longitudemerchant', 'text', false, viewOnly): ''}
                                 {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Latitude Merchant', 'latitudemerchant', 'text', false, viewOnly): ''}
-                                {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'Photo Merchant', 'photomerchant', previewImg, setPreviewImg): ''}
                                 {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Selfie', 'file_selfie', previewImg, setPreviewImg): ''}
                                 {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Document', 'file_document_id', previewImg, setPreviewImg): ''}
                                 {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Document & Selfie', 'file_document_id_selfie', previewImg, setPreviewImg): ''}
diff --git a/yarn.lock b/yarn.lock
index ee15ede..52913b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -39,7 +39,7 @@
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.0.tgz"
   integrity sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==
 
-"@babel/core@^7.25.2":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.25.2":
   version "7.26.0"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz"
   integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
@@ -564,7 +564,7 @@
   resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz"
   integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
 
-"@emotion/react@^11.13.3":
+"@emotion/react@^11.0.0-rc.0", "@emotion/react@^11.13.3", "@emotion/react@^11.4.1", "@emotion/react@^11.5.0":
   version "11.13.3"
   resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.3.tgz"
   integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==
@@ -594,7 +594,7 @@
   resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz"
   integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
 
-"@emotion/styled@^11.13.0":
+"@emotion/styled@^11.13.0", "@emotion/styled@^11.3.0":
   version "11.13.0"
   resolved "https://registry.npmjs.org/@emotion/styled/-/styled-11.13.0.tgz"
   integrity sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA==
@@ -631,6 +631,116 @@
   resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz"
   integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
 
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
 "@esbuild/win32-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz"
@@ -704,7 +814,7 @@
   resolved "https://registry.npmjs.org/@faker-js/faker/-/faker-9.1.0.tgz"
   integrity sha512-GJvX9iM9PBtKScJVlXQ0tWpihK3i0pha/XAhzQa1hPK/ILLa1Wq3I63Ij7lRtqTwmdTxRCyrUhLC5Sly9SLbug==
 
-"@firebase/app@^0.10.15":
+"@firebase/app@^0.10.15", "@firebase/app@0.x":
   version "0.10.15"
   resolved "https://registry.npmjs.org/@firebase/app/-/app-0.10.15.tgz"
   integrity sha512-he6qlG3pmwL+LHdG/BrSMBQeJzzutciq4fpXN3lGa1uSwYSijJ24VtakS/bP2X9SiDf8jGywJ4u+OgXAenJsNg==
@@ -991,7 +1101,7 @@
   dependencies:
     "@babel/runtime" "^7.26.0"
 
-"@mui/material@^6.1.6":
+"@mui/material@^6.1.6", "@mui/material@^6.4.6":
   version "6.4.8"
   resolved "https://registry.npmjs.org/@mui/material/-/material-6.4.8.tgz"
   integrity sha512-5S9UTjKZZBd9GfbcYh/nYfD9cv6OXmj5Y7NgKYfk7JcSoshp8/pW5zP4wecRiroBSZX8wcrywSgogpVNO+5W0Q==
@@ -1580,6 +1690,91 @@
   resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz"
   integrity sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==
 
+"@rollup/rollup-android-arm-eabi@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.2.tgz"
+  integrity sha512-ufoveNTKDg9t/b7nqI3lwbCG/9IJMhADBNjjz/Jn6LxIZxD7T5L8l2uO/wD99945F1Oo8FvgbbZJRguyk/BdzA==
+
+"@rollup/rollup-android-arm64@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.2.tgz"
+  integrity sha512-iZoYCiJz3Uek4NI0J06/ZxUgwAfNzqltK0MptPDO4OR0a88R4h0DSELMsflS6ibMCJ4PnLvq8f7O1d7WexUvIA==
+
+"@rollup/rollup-darwin-arm64@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.2.tgz"
+  integrity sha512-/UhrIxobHYCBfhi5paTkUDQ0w+jckjRZDZ1kcBL132WeHZQ6+S5v9jQPVGLVrLbNUebdIRpIt00lQ+4Z7ys4Rg==
+
+"@rollup/rollup-darwin-x64@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.2.tgz"
+  integrity sha512-1F/jrfhxJtWILusgx63WeTvGTwE4vmsT9+e/z7cZLKU8sBMddwqw3UV5ERfOV+H1FuRK3YREZ46J4Gy0aP3qDA==
+
+"@rollup/rollup-freebsd-arm64@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.2.tgz"
+  integrity sha512-1YWOpFcGuC6iGAS4EI+o3BV2/6S0H+m9kFOIlyFtp4xIX5rjSnL3AwbTBxROX0c8yWtiWM7ZI6mEPTI7VkSpZw==
+
+"@rollup/rollup-freebsd-x64@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.2.tgz"
+  integrity sha512-3qAqTewYrCdnOD9Gl9yvPoAoFAVmPJsBvleabvx4bnu1Kt6DrB2OALeRVag7BdWGWLhP1yooeMLEi6r2nYSOjg==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.2.tgz"
+  integrity sha512-ArdGtPHjLqWkqQuoVQ6a5UC5ebdX8INPuJuJNWRe0RGa/YNhVvxeWmCTFQ7LdmNCSUzVZzxAvUznKaYx645Rig==
+
+"@rollup/rollup-linux-arm-musleabihf@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.2.tgz"
+  integrity sha512-B6UHHeNnnih8xH6wRKB0mOcJGvjZTww1FV59HqJoTJ5da9LCG6R4SEBt6uPqzlawv1LoEXSS0d4fBlHNWl6iYw==
+
+"@rollup/rollup-linux-arm64-gnu@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.2.tgz"
+  integrity sha512-kr3gqzczJjSAncwOS6i7fpb4dlqcvLidqrX5hpGBIM1wtt0QEVtf4wFaAwVv8QygFU8iWUMYEoJZWuWxyua4GQ==
+
+"@rollup/rollup-linux-arm64-musl@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.2.tgz"
+  integrity sha512-TDdHLKCWgPuq9vQcmyLrhg/bgbOvIQ8rtWQK7MRxJ9nvaxKx38NvY7/Lo6cYuEnNHqf6rMqnivOIPIQt6H2AoA==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.2.tgz"
+  integrity sha512-xv9vS648T3X4AxFFZGWeB5Dou8ilsv4VVqJ0+loOIgDO20zIhYfDLkk5xoQiej2RiSQkld9ijF/fhLeonrz2mw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.2.tgz"
+  integrity sha512-tbtXwnofRoTt223WUZYiUnbxhGAOVul/3StZ947U4A5NNjnQJV5irKMm76G0LGItWs6y+SCjUn/Q0WaMLkEskg==
+
+"@rollup/rollup-linux-s390x-gnu@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.2.tgz"
+  integrity sha512-gc97UebApwdsSNT3q79glOSPdfwgwj5ELuiyuiMY3pEWMxeVqLGKfpDFoum4ujivzxn6veUPzkGuSYoh5deQ2Q==
+
+"@rollup/rollup-linux-x64-gnu@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.2.tgz"
+  integrity sha512-jOG/0nXb3z+EM6SioY8RofqqmZ+9NKYvJ6QQaa9Mvd3RQxlH68/jcB/lpyVt4lCiqr04IyaC34NzhUqcXbB5FQ==
+
+"@rollup/rollup-linux-x64-musl@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.2.tgz"
+  integrity sha512-XAo7cJec80NWx9LlZFEJQxqKOMz/lX3geWs2iNT5CHIERLFfd90f3RYLLjiCBm1IMaQ4VOX/lTC9lWfzzQm14Q==
+
+"@rollup/rollup-win32-arm64-msvc@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.2.tgz"
+  integrity sha512-A+JAs4+EhsTjnPQvo9XY/DC0ztaws3vfqzrMNMKlwQXuniBKOIIvAAI8M0fBYiTCxQnElYu7mLk7JrhlQ+HeOw==
+
+"@rollup/rollup-win32-ia32-msvc@4.24.2":
+  version "4.24.2"
+  resolved "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.2.tgz"
+  integrity sha512-ZhcrakbqA1SCiJRMKSU64AZcYzlZ/9M5LaYil9QWxx9vLnkQ9Vnkve17Qn4SjlipqIIBFKjBES6Zxhnvh0EAEw==
+
 "@rollup/rollup-win32-x64-msvc@4.24.2":
   version "4.24.2"
   resolved "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.2.tgz"
@@ -1642,57 +1837,6 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/d3-array@^3.0.3":
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz"
-  integrity sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==
-
-"@types/d3-color@*":
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz"
-  integrity sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==
-
-"@types/d3-ease@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz"
-  integrity sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==
-
-"@types/d3-interpolate@^3.0.1":
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz"
-  integrity sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==
-  dependencies:
-    "@types/d3-color" "*"
-
-"@types/d3-path@*":
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz"
-  integrity sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==
-
-"@types/d3-scale@^4.0.2":
-  version "4.0.9"
-  resolved "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz"
-  integrity sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==
-  dependencies:
-    "@types/d3-time" "*"
-
-"@types/d3-shape@^3.1.0":
-  version "3.1.7"
-  resolved "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz"
-  integrity sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==
-  dependencies:
-    "@types/d3-path" "*"
-
-"@types/d3-time@*", "@types/d3-time@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz"
-  integrity sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==
-
-"@types/d3-timer@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz"
-  integrity sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==
-
 "@types/estree@^1.0.6", "@types/estree@1.0.6":
   version "1.0.6"
   resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"
@@ -1723,7 +1867,7 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/node@^22.9.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
+"@types/node@^18.0.0 || >=20.0.0", "@types/node@^22.9.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
   version "22.9.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz"
   integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==
@@ -1740,7 +1884,7 @@
   resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz"
   integrity sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==
 
-"@types/react-dom@^18.3.1":
+"@types/react-dom@*", "@types/react-dom@^18.3.1":
   version "18.3.1"
   resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz"
   integrity sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==
@@ -1759,7 +1903,7 @@
   resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz"
   integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
 
-"@types/react@*", "@types/react@^18.3.12", "@types/react@16 || 17 || 18":
+"@types/react@*", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^16.9.0 || ^17.0.0 || ^18.0.0", "@types/react@^17.0.0 || ^18.0.0", "@types/react@^17.0.0 || ^18.0.0 || ^19.0.0", "@types/react@^18.3.12", "@types/react@16 || 17 || 18":
   version "18.3.12"
   resolved "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz"
   integrity sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==
@@ -1801,7 +1945,7 @@
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@^8.14.0", "@typescript-eslint/parser@8.14.0":
+"@typescript-eslint/parser@^8.0.0 || ^8.0.0-alpha.0", "@typescript-eslint/parser@^8.14.0", "@typescript-eslint/parser@8.14.0":
   version "8.14.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.14.0.tgz"
   integrity sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==
@@ -1910,7 +2054,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.12.0:
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.12.0:
   version "8.14.0"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz"
   integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
@@ -1960,7 +2104,7 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@3.52.0:
+apexcharts@^3.41.0, apexcharts@3.52.0:
   version "3.52.0"
   resolved "https://registry.npmjs.org/apexcharts/-/apexcharts-3.52.0.tgz"
   integrity sha512-7dg0ADKs8AA89iYMZMe2sFDG0XK5PfqllKV9N+i3hKHm3vEtdhwz8AlXGm+/b0nJ6jKiaXsqci5LfVxNhtB+dA==
@@ -2076,7 +2220,7 @@ broadcast-channel@^3.4.1:
     rimraf "3.0.2"
     unload "2.2.0"
 
-browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0:
+browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0, "browserslist@>= 4.21.0":
   version "4.24.2"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz"
   integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
@@ -2161,7 +2305,7 @@ clsx@^1.1.0:
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-clsx@^2.0.0, clsx@^2.1.0, clsx@^2.1.1:
+clsx@^2.1.0, clsx@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz"
   integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
@@ -2290,83 +2434,12 @@ cssjanus@^2.0.1:
   resolved "https://registry.npmjs.org/cssjanus/-/cssjanus-2.3.0.tgz"
   integrity sha512-ZZXXn51SnxRxAZ6fdY7mBDPmA4OZd83q/J9Gdqz3YmE9TUq+9tZl+tdOnCi7PpNygI6PEkehj9rgifv5+W8a5A==
 
-csstype@^3.0.2, csstype@^3.1.3, csstype@3.1.3:
+csstype@^3.0.10, csstype@^3.0.2, csstype@^3.1.3, csstype@3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-d3-array@^3.1.6, "d3-array@2 - 3", "d3-array@2.10.0 - 3":
-  version "3.2.4"
-  resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz"
-  integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
-  dependencies:
-    internmap "1 - 2"
-
-"d3-color@1 - 3":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz"
-  integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
-
-d3-ease@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz"
-  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
-
-"d3-format@1 - 3":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz"
-  integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
-
-d3-interpolate@^3.0.1, "d3-interpolate@1.2.0 - 3":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz"
-  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
-  dependencies:
-    d3-color "1 - 3"
-
-d3-path@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz"
-  integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
-
-d3-scale@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz"
-  integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
-  dependencies:
-    d3-array "2.10.0 - 3"
-    d3-format "1 - 3"
-    d3-interpolate "1.2.0 - 3"
-    d3-time "2.1.1 - 3"
-    d3-time-format "2 - 4"
-
-d3-shape@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz"
-  integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
-  dependencies:
-    d3-path "^3.1.0"
-
-"d3-time-format@2 - 4":
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz"
-  integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==
-  dependencies:
-    d3-time "1 - 3"
-
-d3-time@^3.0.0, "d3-time@1 - 3", "d3-time@2.1.1 - 3":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz"
-  integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
-  dependencies:
-    d3-array "2 - 3"
-
-d3-timer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz"
-  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
-
-date-fns@^3.0.0:
+"date-fns@^2.28.0 || ^3.0.0", date-fns@^3.0.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz"
   integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==
@@ -2378,11 +2451,6 @@ debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   dependencies:
     ms "^2.1.3"
 
-decimal.js-light@^2.4.1:
-  version "2.5.1"
-  resolved "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz"
-  integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
-
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
@@ -2513,7 +2581,7 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^9.1.0:
+eslint-config-prettier@*, eslint-config-prettier@^9.1.0:
   version "9.1.0"
   resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz"
   integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
@@ -2554,7 +2622,7 @@ eslint-visitor-keys@^4.1.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz"
   integrity sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==
 
-eslint@^9.13.0:
+"eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^8.57.0 || ^9.0.0", eslint@^9.13.0, eslint@>=7, eslint@>=7.0.0, eslint@>=8.0.0:
   version "9.13.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz"
   integrity sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==
@@ -2628,11 +2696,6 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-eventemitter3@^4.0.1:
-  version "4.0.7"
-  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -2643,11 +2706,6 @@ fast-diff@^1.1.2:
   resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-equals@^5.0.1:
-  version "5.2.2"
-  resolved "https://registry.npmjs.org/fast-equals/-/fast-equals-5.2.2.tgz"
-  integrity sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==
-
 fast-glob@^3.2.12, fast-glob@^3.3.0, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
@@ -2762,6 +2820,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
+fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
@@ -2947,11 +3010,6 @@ inherits@2:
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-"internmap@1 - 2":
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz"
-  integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
-
 intl-messageformat@10.7.6:
   version "10.7.6"
   resolved "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.6.tgz"
@@ -3024,7 +3082,7 @@ jackspeak@^3.1.2:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jiti@^1.18.2, jiti@^1.21.0:
+jiti@*, jiti@^1.18.2, jiti@^1.21.0:
   version "1.21.6"
   resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz"
   integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
@@ -3088,7 +3146,7 @@ kolorist@^1.8.0:
   resolved "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz"
   integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
 
-leaflet@^1.9.4:
+leaflet@^1.9.0, leaflet@^1.9.4:
   version "1.9.4"
   resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz"
   integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
@@ -3256,12 +3314,10 @@ merge2@^1.3.0:
     react-query "^3.39.3"
     react-router "^6.28.0"
     react-router-dom "^6.28.0"
-    recharts "^2.15.3"
     sonner "^1.7.0"
     styled-components "^6.1.13"
     stylis "^4.3.4"
     stylis-plugin-rtl "^2.1.1"
-    sweetalert2 "^11.19.1"
     tabs "^0.2.0"
     tailwind-merge "^2.5.4"
     tailwindcss-animate "^1.0.7"
@@ -3835,7 +3891,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.23, postcss@^8.4.43, postcss@^8.4.49:
+postcss@^8, postcss@^8.0.0, postcss@^8.0.3, postcss@^8.1.0, postcss@^8.2.14, postcss@^8.4, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.43, postcss@^8.4.49, postcss@^8.4.6, postcss@>=8.0.9:
   version "8.4.49"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz"
   integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
@@ -3865,7 +3921,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^3.3.3:
+prettier@^3.3.3, prettier@>=3.0.0:
   version "3.3.3"
   resolved "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz"
   integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
@@ -3936,7 +3992,7 @@ react-day-picker@^8.10.1:
   resolved "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.1.tgz"
   integrity sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==
 
-react-dom@^18.3.1:
+"react-dom@^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom@^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc", "react-dom@^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom@^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom@^17.0.0 || ^18.0.0", "react-dom@^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom@^18 || ^19 || ^19.0.0-rc", react-dom@^18.0.0, "react-dom@^18.0.0 || ^19.0.0 || ^19.0.0-rc", react-dom@^18.3.1, "react-dom@>= 16.8.0", react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=16.8.0:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz"
   integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
@@ -4091,15 +4147,6 @@ react-side-effect@^2.1.0:
   resolved "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz"
   integrity sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==
 
-react-smooth@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz"
-  integrity sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==
-  dependencies:
-    fast-equals "^5.0.1"
-    prop-types "^15.8.1"
-    react-transition-group "^4.4.5"
-
 react-style-singleton@^2.2.1:
   version "2.2.1"
   resolved "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz"
@@ -4119,7 +4166,7 @@ react-transition-group@^4.4.5:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^18.3.1:
+"react@^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react@^16.3.0 || ^17.0.0 || ^18.0.0", "react@^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc", "react@^16.6.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 || 18", "react@^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc", "react@^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^17.0.0 || ^18.0.0", "react@^17.0.0 || ^18.0.0 || ^19.0.0", "react@^18 || ^19", "react@^18 || ^19 || ^19.0.0-rc", react@^18.0.0, "react@^18.0.0 || ^19.0.0 || ^19.0.0-rc", react@^18.3.1, "react@>= 16.8.0", react@>=0.13, react@>=16.3.0, react@>=16.6.0, react@>=16.8, react@>=16.8.0, "react@16.8 - 18":
   version "18.3.1"
   resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz"
   integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
@@ -4140,27 +4187,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-recharts-scale@^0.4.4:
-  version "0.4.5"
-  resolved "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz"
-  integrity sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==
-  dependencies:
-    decimal.js-light "^2.4.1"
-
-recharts@^2.15.3:
-  version "2.15.3"
-  resolved "https://registry.npmjs.org/recharts/-/recharts-2.15.3.tgz"
-  integrity sha512-EdOPzTwcFSuqtvkDoaM5ws/Km1+WTAO2eizL7rqiG0V2UVhTnz0m7J2i0CjVPUCdEkZImaWvXLbZDS2H5t6GFQ==
-  dependencies:
-    clsx "^2.0.0"
-    eventemitter3 "^4.0.1"
-    lodash "^4.17.21"
-    react-is "^18.3.1"
-    react-smooth "^4.0.4"
-    recharts-scale "^0.4.4"
-    tiny-invariant "^1.3.1"
-    victory-vendor "^36.6.8"
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz"
@@ -4387,7 +4413,7 @@ stylis-plugin-rtl@^2.1.1:
   dependencies:
     cssjanus "^2.0.1"
 
-stylis@^4.3.4:
+stylis@^4.3.4, stylis@4.x:
   version "4.3.4"
   resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.4.tgz"
   integrity sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==
@@ -4482,11 +4508,6 @@ svg.select.js@^3.0.1:
   dependencies:
     svg.js "^2.6.5"
 
-sweetalert2@^11.19.1:
-  version "11.19.1"
-  resolved "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.19.1.tgz"
-  integrity sha512-+8yws3Sc1srAZbrgdhmEIZny1I1UOYhJOIOdtOlv4TYaP5kkwQ9Zm8/BT23Qg+KdByCNOazltxEJAHzXVu8mhA==
-
 synckit@^0.9.1:
   version "0.9.2"
   resolved "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz"
@@ -4510,7 +4531,7 @@ tailwindcss-animate@^1.0.7:
   resolved "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz"
   integrity sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==
 
-tailwindcss@^3.4.14:
+tailwindcss@^3.4.14, "tailwindcss@>=3.0.0 || insiders":
   version "3.4.14"
   resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz"
   integrity sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==
@@ -4562,11 +4583,6 @@ tiny-case@^1.0.3:
   resolved "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz"
   integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==
 
-tiny-invariant@^1.3.1:
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz"
-  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
-
 tiny-warning@^1.0.2:
   version "1.0.3"
   resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
@@ -4625,7 +4641,7 @@ typescript-eslint@^8.14.0:
     "@typescript-eslint/parser" "8.14.0"
     "@typescript-eslint/utils" "8.14.0"
 
-typescript@^5.6.3:
+"typescript@^4.7 || 5", typescript@^5.6.3, typescript@>=4.2.0:
   version "5.6.3"
   resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz"
   integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
@@ -4683,26 +4699,6 @@ util-deprecate@^1.0.2:
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-victory-vendor@^36.6.8:
-  version "36.9.2"
-  resolved "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz"
-  integrity sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==
-  dependencies:
-    "@types/d3-array" "^3.0.3"
-    "@types/d3-ease" "^3.0.0"
-    "@types/d3-interpolate" "^3.0.1"
-    "@types/d3-scale" "^4.0.2"
-    "@types/d3-shape" "^3.1.0"
-    "@types/d3-time" "^3.0.0"
-    "@types/d3-timer" "^3.0.0"
-    d3-array "^3.1.6"
-    d3-ease "^3.0.1"
-    d3-interpolate "^3.0.1"
-    d3-scale "^4.0.2"
-    d3-shape "^3.1.0"
-    d3-time "^3.0.0"
-    d3-timer "^3.0.1"
-
 vite-plugin-windicss@^1.9.3:
   version "1.9.3"
   resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-1.9.3.tgz"
@@ -4713,7 +4709,7 @@ vite-plugin-windicss@^1.9.3:
     kolorist "^1.8.0"
     windicss "^3.5.6"
 
-vite@^5.4.11:
+"vite@^2.0.1 || ^3.0.0 || ^4.0.0 || ^5.0.0", "vite@^4.2.0 || ^5.0.0", vite@^5.4.11:
   version "5.4.11"
   resolved "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz"
   integrity sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==

From eb2a1b35b41decef973fe13c57fee4656eb13207 Mon Sep 17 00:00:00 2001
From: bagusajisaputroo <bagusajisaputro21@gmail.com>
Date: Fri, 2 May 2025 15:02:16 +0700
Subject: [PATCH 03/15] fix transferttype + wallet history

---
 .../feedback-member/blocks/EditDialog.tsx     | 13 ++-
 .../transfertype/blocks/ListToolBar.tsx       | 18 +---
 .../hooks/ManageTransferTypeContext.tsx       |  2 +-
 .../wallet-history/blocks/ListToolbar.tsx     | 90 ++++++++++---------
 4 files changed, 56 insertions(+), 67 deletions(-)

diff --git a/src/pages/members/feedback-member/blocks/EditDialog.tsx b/src/pages/members/feedback-member/blocks/EditDialog.tsx
index b12a0c0..c99d396 100644
--- a/src/pages/members/feedback-member/blocks/EditDialog.tsx
+++ b/src/pages/members/feedback-member/blocks/EditDialog.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { Dialog, DialogContent } from '@/components/ui/dialog';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import {
   Select,
   SelectContent,
@@ -59,16 +59,12 @@ const EditDialog = () => {
       if (response?.status) {
         toast.success('Feedback reviewed successfully');
 
-        // Close the edit dialog
         handleEditDialog(false, null);
 
-        // First close the detail dialog to reset its state
         handleDetailDialog(false, null);
 
-        // Refresh the main data grid first
         refreshData();
 
-        // Wait a tiny bit then reopen the detail with refreshed data
         setTimeout(() => {
           handleDetailDialog(true, selectedFeedback);
         }, 300);
@@ -97,7 +93,6 @@ const EditDialog = () => {
       }
 
       const data = response.data;
-      // console.log('Fetched data:', data);
 
       setReviewNotes(data.review_notes || '');
 
@@ -112,7 +107,11 @@ const EditDialog = () => {
 
   return (
     <Dialog open={showEditDialog} onOpenChange={(open) => handleEditDialog(open, null)}>
-      <DialogContent className="p-0 w-full sm:max-w-2xl bg-white rounded-lg overflow-hidden">
+      <DialogContent className="p-0 w-full sm:max-w-2xl bg-white rounded-lg overflow-hidden [&>button]:hidden">
+        <DialogHeader>
+          <DialogTitle></DialogTitle>
+          <DialogDescription></DialogDescription>
+        </DialogHeader>
         <div className="relative">
           <div className="p-6 flex items-center justify-between border-b">
             <div>
diff --git a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
index d57d2a4..d49caa7 100644
--- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
+++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
@@ -46,8 +46,6 @@ const typeLabelMap: Record<string, string> = {
   IC: 'Income Merchant'
 };
 
-// Import section remains the same...
-
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
   const { handleAddDialog } = useManageTransferTypeContext();
@@ -97,32 +95,25 @@ const ListToolbar = () => {
   }, []);
 
   const handleClearFilter = () => {
-    // Reset state variables
     setSearchValue('');
     setStatusTypes('');
     setApproval('');
 
-    // Clear all column filters
     table.getColumn('name')?.setFilterValue('');
     table.getColumn('type')?.setFilterValue('');
     table.getColumn('status_approval')?.setFilterValue('');
 
-    // Force reset the Select components by using setTimeout
-    // This ensures the state updates are processed before resetting the UI
     setTimeout(() => {
-      // Reset to first page
       table.setPageIndex(0);
-      // Reload the data
       reload();
     }, 0);
   };
 
   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">
-        {/* Top bar */}
+    <div className="card-header flex-wrap border-b-0 px-5">
+      <div className="flex flex-wrap gap-1  w-full">
         <div className="flex justify-between w-full items-center mb-3">
-          <div className="flex w-[34%] gap-2 items-center">
+          <div className="flex w-[34%] gap-1 items-center">
             <label className="input input-sm w-full text-sm">
               <KeenIcon icon="magnifier" />
               <input
@@ -153,9 +144,7 @@ const ListToolbar = () => {
           </div>
         </div>
 
-        {/* Filter bar */}
         <div className="flex flex-wrap gap-2 w-full">
-          {/* Type Filter */}
           <div className="min-w-[220px]">
             <Select
               key={`type-filter-${statusTypes}`}
@@ -175,7 +164,6 @@ const ListToolbar = () => {
             </Select>
           </div>
 
-          {/* Approval Filter */}
           <div className="min-w-[220px]">
             <Select
               key={`approval-filter-${approval}`}
diff --git a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
index 0d7982a..8ae1aed 100644
--- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
+++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
@@ -325,7 +325,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
       order_direction: orderDirection,
       filter: JSON.stringify(filterObject)
     });
-    console.log(response);
+    // console.log(response);
     return { data: response?.data.list, totalCount: response?.data.total_count };
   };
 
diff --git a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
index 683e9ae..524bdf2 100644
--- a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
+++ b/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>

From 30b26216dabe5f9ee41fe48ede833602f9bf55b1 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Fri, 2 May 2025 16:29:02 +0700
Subject: [PATCH 04/15] update add trigger for current balance

---
 .../blocks/DetailApprovalTransaction.tsx      | 124 ++++++++++++++--
 .../blocks/DetailTransaction.tsx              | 136 +++++++++++++++---
 2 files changed, 229 insertions(+), 31 deletions(-)

diff --git a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
index 4b5d549..35756d2 100644
--- a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
@@ -10,8 +10,10 @@ import {
     DialogHeader,
     DialogTitle
 } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
 
 const API_URL = apiConfig.transaction;
+const API_URL_CURRENT_BALANCE = apiConfig.service_wallet;
 
 const DetailApprovalTransaction = () => {
     const { GetData } = useCallApi();
@@ -51,6 +53,60 @@ const DetailApprovalTransaction = () => {
         }
     }, [showDetailDialog]);
 
+    const [currentBalance, setCurrentBalance] = useState<number | null>(null);
+    const [currentBalanceTransfer, setCurrentBalanceTransfer] = useState<number | null>(null);
+    useEffect(() => {
+        setCurrentBalance(null);
+    }, [transactionDetails]);
+
+    useEffect(() => {
+        setCurrentBalanceTransfer(null);
+    }, [transactionDetails]);
+
+    const getCurrentBallanceWallet = async (customerId: string) => {
+        try {
+            const responsecurrentbalance = await GetData(
+                `${API_URL_CURRENT_BALANCE}/dashboard/balance/account/${customerId}`,
+                {}
+            );
+
+            const match = responsecurrentbalance?.data?.find(
+                (item: any) => item.id_wallet === transactionDetails?.origin_wallet?.id
+            );
+
+            if (match) {
+                // console.log('Matched Wallet:', match); // Optional debug
+                return match.amount;
+            }
+        } catch (error) {
+            console.error('Error fetching current balance', error);
+        }
+
+        return null;
+    };
+
+    const getCurrentBallanceWalletTransfer = async (customerIdtransfer: string) => {
+        try {
+            const response = await GetData(
+                `${API_URL_CURRENT_BALANCE}/dashboard/balance/account/${customerIdtransfer}`,
+                {}
+            );
+
+            const match = response?.data?.find(
+                (item: any) => item.id_wallet === transactionDetails?.transfer?.destination_wallet?.id
+            );
+
+            if (match) {
+                // console.log('Matched Wallet:', match);
+                return match.amount;
+            }
+        } catch (error) {
+            console.error('Error fetching current balance', error);
+        }
+
+        return null;
+    };
+
 
     return (
         <Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}>
@@ -471,7 +527,27 @@ const DetailApprovalTransaction = () => {
                                         <p className="text-sm text-gray-500">Description</p>
                                         <p className="font-medium">{transactionDetails?.origin_wallet.description}</p>
                                     </div>
+                                    <div>
+                                        <p className="text-sm text-gray-500">Current Balance</p>
+                                        <p className="font-medium">
+                                            {currentBalance !== null && currentBalance !== undefined
+                                                ? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(currentBalance)
+                                                : '-'}
+                                        </p>
+                                    </div>
                                 </div>
+                                <Button
+                                    className="btn btn-primary"
+                                    type="button"
+                                    onClick={async () => {
+                                        const balance = await getCurrentBallanceWallet(transactionDetails?.origin_customer.id);
+                                        if (balance !== null) {
+                                            setCurrentBalance(balance);
+                                        }
+                                    }}
+                                >
+                                    Generate Current Balance
+                                </Button>
                             </div>
                         )}
 
@@ -482,16 +558,42 @@ const DetailApprovalTransaction = () => {
                                 {!transactionDetails?.transfer ? (
                                     <div className="text-center text-sm text-gray-500">No Data available</div>
                                 ) : (
-                                    <div className="grid grid-cols-2 gap-4">
-                                        <div>
-                                            <p className="text-sm text-gray-500">Name</p>
-                                            <p className="font-medium">{transactionDetails.transfer.destination_wallet.name}</p>
+                                    <>
+                                        <div className="grid grid-cols-2 gap-4">
+                                            <div>
+                                                <p className="text-sm text-gray-500">Name</p>
+                                                <p className="font-medium">{transactionDetails.transfer.destination_wallet.name}</p>
+                                            </div>
+                                            <div>
+                                                <p className="text-sm text-gray-500">Description</p>
+                                                <p className="font-medium">{transactionDetails.transfer.destination_wallet.description}</p>
+                                            </div>
+                                            <div>
+                                                <p className="text-sm text-gray-500">Current Balance</p>
+                                                <p className="font-medium">
+                                                    {currentBalanceTransfer !== null
+                                                        ? new Intl.NumberFormat('en-US', {
+                                                            style: 'currency',
+                                                            currency: 'USD',
+                                                        }).format(currentBalanceTransfer)
+                                                        : '-'}
+                                                </p>
+                                            </div>
                                         </div>
-                                        <div>
-                                            <p className="text-sm text-gray-500">Description</p>
-                                            <p className="font-medium">{transactionDetails.transfer.destination_wallet.description}</p>
-                                        </div>
-                                    </div>
+                                        <Button
+                                            className="btn btn-primary"
+                                            type="button"
+                                            onClick={async () => {
+                                                const customerId = transactionDetails?.transfer?.destination_customer?.id;
+                                                const balance = await getCurrentBallanceWalletTransfer(customerId);
+                                                if (balance !== null) {
+                                                    setCurrentBalanceTransfer(balance); // ✅ INI YANG BENAR
+                                                }
+                                            }}
+                                        >
+                                            Generate Current Balance
+                                        </Button>
+                                    </>
                                 )}
                             </div>
                         )}
@@ -540,8 +642,8 @@ const DetailApprovalTransaction = () => {
                                                             })
                                                             : ''}</td>
                                                         <td className="px-4 py-2 text-sm text-gray-500">{log.request_body}</td>
-                                                            <td className="px-4 py-2 text-sm text-gray-500">{log.response_body}</td>
-                                                            <td className="px-4 py-2 text-sm text-gray-500">{log.request_endpoint}</td>
+                                                        <td className="px-4 py-2 text-sm text-gray-500">{log.response_body}</td>
+                                                        <td className="px-4 py-2 text-sm text-gray-500">{log.request_endpoint}</td>
                                                     </tr>
                                                 ))
                                             ) : (
diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
index de6a873..decf631 100644
--- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
+++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
@@ -13,11 +13,15 @@ import {
     DialogTitle
 } from '@/components/ui/dialog';
 import { useDataGrid } from '@/components';
+import { Button } from '@/components/ui/button';
 
 const API_URL = apiConfig.transaction;
+const API_URL_CURRENT_BALANCE = apiConfig.service_wallet;
+
 
 const DetailTransaction = () => {
     const { GetData } = useCallApi();
+
     // const { reload } = useDataGrid();
     const {
         showDetailDialog,
@@ -45,7 +49,7 @@ const DetailTransaction = () => {
                         id: selectedTransactionId
                     });
                     setTransactionDetails(response?.data);
-                    // console.log(response?.data);
+                    // console.log(response?.data.origin_customer.id);
                     // console.log(selectedTransactionId);
                 } catch (error) {
                     console.error('Error fetching transaction', error);
@@ -67,6 +71,61 @@ const DetailTransaction = () => {
         }
     }, [showDetailDialog]);
 
+    const [currentBalance, setCurrentBalance] = useState<number | null>(null);
+    const [currentBalanceTransfer, setCurrentBalanceTransfer] = useState<number | null>(null);
+
+    useEffect(() => {
+        setCurrentBalance(null);
+    }, [transactionDetails]);
+
+    useEffect(() => {
+        setCurrentBalanceTransfer(null);
+    }, [transactionDetails]);
+
+    const getCurrentBallanceWallet = async (customerId: string) => {
+        try {
+            const responsecurrentbalance = await GetData(
+                `${API_URL_CURRENT_BALANCE}/dashboard/balance/account/${customerId}`,
+                {}
+            );
+
+            const match = responsecurrentbalance?.data?.find(
+                (item: any) => item.id_wallet === transactionDetails?.origin_wallet?.id
+            );
+
+            if (match) {
+                // console.log('Matched Wallet:', match); // Optional debug
+                return match.amount;
+            }
+        } catch (error) {
+            console.error('Error fetching current balance', error);
+        }
+
+        return null;
+    };
+
+
+    const getCurrentBallanceWalletTransfer = async (customerIdtransfer: string) => {
+        try {
+            const response = await GetData(
+                `${API_URL_CURRENT_BALANCE}/dashboard/balance/account/${customerIdtransfer}`,
+                {}
+            );
+
+            const match = response?.data?.find(
+                (item: any) => item.id_wallet === transactionDetails?.transfer?.destination_wallet?.id
+            );
+
+            if (match) {
+                // console.log('Matched Wallet:', match);
+                return match.amount;
+            }
+        } catch (error) {
+            console.error('Error fetching current balance', error);
+        }
+
+        return null;
+    };
 
     return (
         <Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}>
@@ -231,16 +290,6 @@ const DetailTransaction = () => {
                                     </div>
                                 </div>
 
-                                <h3 className="font-semibold flex items-center">
-                                    Origin Wallet
-                                    <span className="ml-2 bg-blue-100 text-blue-800 text-xs font-semibold mr-2 px-2.5 py-0.5 rounded">
-                                        Wallet
-                                    </span>
-                                </h3>
-                                <div className="grid grid-cols-2 gap-4">
-
-                                </div>
-
                                 <h3 className="font-semibold flex items-center">
                                     Purchase
                                     <span className="ml-2 bg-blue-100 text-blue-800 text-xs font-semibold mr-2 px-2.5 py-0.5 rounded">
@@ -482,7 +531,27 @@ const DetailTransaction = () => {
                                         <p className="text-sm text-gray-500">Description</p>
                                         <p className="font-medium">{transactionDetails?.origin_wallet.description}</p>
                                     </div>
+                                    <div>
+                                        <p className="text-sm text-gray-500">Current Balance</p>
+                                        <p className="font-medium">
+                                            {currentBalance !== null && currentBalance !== undefined
+                                                ? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(currentBalance)
+                                                : '-'}
+                                        </p>
+                                    </div>
                                 </div>
+                                <Button
+                                    className="btn btn-primary"
+                                    type="button"
+                                    onClick={async () => {
+                                        const balance = await getCurrentBallanceWallet(transactionDetails?.origin_customer.id);
+                                        if (balance !== null) {
+                                            setCurrentBalance(balance);
+                                        }
+                                    }}
+                                >
+                                    Generate Current Balance
+                                </Button>
                             </div>
                         )}
 
@@ -493,16 +562,43 @@ const DetailTransaction = () => {
                                 {!transactionDetails?.transfer ? (
                                     <div className="text-sm text-gray-500">No Data available</div>
                                 ) : (
-                                    <div className="grid grid-cols-2 gap-4">
-                                        <div>
-                                            <p className="text-sm text-gray-500">Name</p>
-                                            <p className="font-medium">{transactionDetails.transfer.destination_wallet.name}</p>
+                                    <>
+                                        <div className="grid grid-cols-2 gap-4">
+                                            <div>
+                                                <p className="text-sm text-gray-500">Name</p>
+                                                <p className="font-medium">{transactionDetails.transfer.destination_wallet.name}</p>
+                                            </div>
+                                            <div>
+                                                <p className="text-sm text-gray-500">Description</p>
+                                                <p className="font-medium">{transactionDetails.transfer.destination_wallet.description}</p>
+                                            </div>
+                                            <div>
+                                                <p className="text-sm text-gray-500">Current Balance</p>
+                                                <p className="font-medium">
+                                                    {currentBalanceTransfer !== null
+                                                        ? new Intl.NumberFormat('en-US', {
+                                                            style: 'currency',
+                                                            currency: 'USD',
+                                                        }).format(currentBalanceTransfer)
+                                                        : '-'}
+                                                </p>
+                                            </div>
                                         </div>
-                                        <div>
-                                            <p className="text-sm text-gray-500">Description</p>
-                                            <p className="font-medium">{transactionDetails.transfer.destination_wallet.description}</p>
-                                        </div>
-                                    </div>
+                                        <Button
+                                            className="btn btn-primary"
+                                            type="button"
+                                            onClick={async () => {
+                                                const customerId = transactionDetails?.transfer?.destination_customer?.id;
+                                                const balance = await getCurrentBallanceWalletTransfer(customerId);
+                                                if (balance !== null) {
+                                                    setCurrentBalanceTransfer(balance); // ✅ INI YANG BENAR
+                                                }
+                                            }}
+                                        >
+                                            Generate Current Balance
+                                        </Button>
+                                    </>
+
                                 )}
                             </div>
                         )}

From fef07ae63253e8bdd4c42b5a6868c7dd4c205aea Mon Sep 17 00:00:00 2001
From: bagusajisaputroo <bagusajisaputro21@gmail.com>
Date: Fri, 2 May 2025 16:39:56 +0700
Subject: [PATCH 05/15] fix clear filter wallet history

---
 .../wallet-history/blocks/ListToolbar.tsx     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
index 524bdf2..ff21a0a 100644
--- a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
+++ b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
@@ -94,25 +94,26 @@ const ListToolbar = () => {
 
   const handleClearAllFilters = () => {
     const today = new Date();
-    const threeMonthsAgo = getOneMonthsAgo();
+    const oneMonthAgo = getOneMonthsAgo();
     const resetDateRange = {
-      from: formatDate(threeMonthsAgo),
+      from: formatDate(oneMonthAgo),
       to: formatDate(today)
     };
-
+  
     setSearchValue('');
     setWalletId('');
     setDateRange(resetDateRange);
-
-    // table.getAllColumns().forEach((column) => {
-    //   if (column.id !== 'CreatedAt') {
-    //     column.setFilterValue(undefined);
-    //   }
-    // });
-
+  
+    table.getColumn('msisdn')?.setFilterValue('');
+    table.getColumn('id_wallet')?.setFilterValue('');
     table.getColumn('CreatedAt')?.setFilterValue(resetDateRange);
-    table.setPageIndex(0);
+  
+    setTimeout(() => {
+      table.setPageIndex(0);
+      reload();
+    }, 0);
   };
+  
 
   const handleRefresh = () => {
     const today = new Date();

From 545e7016f9ca97088d81280b6de0ea576ebda0a1 Mon Sep 17 00:00:00 2001
From: bagusajisaputroo <bagusajisaputro21@gmail.com>
Date: Mon, 5 May 2025 12:53:19 +0700
Subject: [PATCH 06/15] fixing styling clear filter

---
 .../transfertype/blocks/ListToolBar.tsx       | 115 ++++++++++--------
 .../wallet-history/blocks/ListToolbar.tsx     |  12 +-
 2 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
index d49caa7..308c074 100644
--- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
+++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
@@ -111,24 +111,71 @@ const ListToolbar = () => {
 
   return (
     <div className="card-header flex-wrap border-b-0 px-5">
-      <div className="flex flex-wrap gap-1  w-full">
+      <div className="flex flex-wrap gap-1 w-full">
         <div className="flex justify-between w-full items-center mb-3">
-          <div className="flex w-[34%] gap-1 items-center">
-            <label className="input input-sm w-full text-sm">
-              <KeenIcon icon="magnifier" />
-              <input
-                type="text"
-                placeholder="Search Transaction Type Name"
-                value={searchValue}
-                onChange={(e) => setSearchValue(e.target.value)}
-              />
-            </label>
+          <div className="flex flex-nowrap items-end gap-3 w-full overflow-x-auto">
+            <div className="w-48 shrink-0">
+              <label className="input input-sm w-full text-sm">
+                <KeenIcon icon="magnifier" />
+                <input
+                  type="text"
+                  placeholder="Search Name"
+                  value={searchValue}
+                  onChange={(e) => setSearchValue(e.target.value)}
+                />
+              </label>
+            </div>
+
+            <div className="min-w-[220px] shrink-0">
+              <Select
+                key={`type-filter-${statusTypes}`}
+                value={statusTypes}
+                onValueChange={setStatusTypes}
+              >
+                <SelectTrigger className="h-8 text-sm">
+                  <SelectValue placeholder="Select Status Transaction Type" />
+                </SelectTrigger>
+                <SelectContent className="max-h-64 overflow-y-auto">
+                  {types.map((opt) => (
+                    <SelectItem key={opt} value={opt} className="truncate">
+                      {typeLabelMap[opt] ?? opt}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+
+            <div className="min-w-[220px] shrink-0">
+              <Select
+                key={`approval-filter-${approval}`}
+                value={approval}
+                onValueChange={setApproval}
+              >
+                <SelectTrigger className="h-8 text-sm">
+                  <SelectValue placeholder="Select Status Approval" />
+                </SelectTrigger>
+                <SelectContent className="max-h-64 overflow-y-auto">
+                  <SelectItem value="Y" className="truncate">
+                    Yes
+                  </SelectItem>
+                  <SelectItem value="N" className="truncate">
+                    No
+                  </SelectItem>
+                </SelectContent>
+              </Select>
+            </div>
+            <DefaultTooltip title={'Reset Filter'} placement={'top'}>
+              <Button
+                variant="outline"
+                className="h-7.5 disabled:bg-gray-400"
+                onClick={handleClearFilter}
+              >
+                <KeenIcon icon="arrow-circle-left" />
+              </Button>
+            </DefaultTooltip>
           </div>
 
           <div className="flex gap-2 items-center">
-            <Button variant="outline" className="h-8 px-3 text-xs" onClick={handleClearFilter}>
-              Clear
-            </Button>
             <Button
               variant="outline"
               className="h-8 px-3 text-xs"
@@ -144,46 +191,6 @@ const ListToolbar = () => {
           </div>
         </div>
 
-        <div className="flex flex-wrap gap-2 w-full">
-          <div className="min-w-[220px]">
-            <Select
-              key={`type-filter-${statusTypes}`}
-              value={statusTypes}
-              onValueChange={setStatusTypes}
-            >
-              <SelectTrigger className="h-8 text-sm">
-                <SelectValue placeholder="Select Status Transaction Type" />
-              </SelectTrigger>
-              <SelectContent className="w-[var(--radix-select-trigger-width)] max-h-64 overflow-y-auto">
-                {types.map((opt) => (
-                  <SelectItem key={opt} value={opt} className="truncate">
-                    {typeLabelMap[opt] ?? opt}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-
-          <div className="min-w-[220px]">
-            <Select
-              key={`approval-filter-${approval}`}
-              value={approval}
-              onValueChange={setApproval}
-            >
-              <SelectTrigger className="h-8 text-sm">
-                <SelectValue placeholder="Select Status Approval" />
-              </SelectTrigger>
-              <SelectContent className="w-[var(--radix-select-trigger-width)] max-h-64 overflow-y-auto">
-                <SelectItem value="Y" className="truncate">
-                  Yes
-                </SelectItem>
-                <SelectItem value="N" className="truncate">
-                  No
-                </SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-        </div>
       </div>
     </div>
   );
diff --git a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
index ff21a0a..6e2c9a2 100644
--- a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
+++ b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
@@ -182,9 +182,15 @@ const ListToolbar = () => {
           </div>
 
           <div className="flex gap-3 items-center">
-            <Button variant="outline" size="sm" onClick={handleClearAllFilters}>
-              Clear
-            </Button>
+          <DefaultTooltip title={'Reset Filter'} placement={'top'}>
+              <Button
+                variant="outline"
+                className="h-7.5 disabled:bg-gray-400"
+                onClick={handleClearAllFilters}
+              >
+                <KeenIcon icon="arrow-circle-left" />
+              </Button>
+            </DefaultTooltip>
             <DefaultTooltip title={'Refresh'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={handleRefresh}>
                 <KeenIcon icon="arrows-circle" />

From 1f1c7a60a3e8cf3bfedabae8b252dde4d99f95ef Mon Sep 17 00:00:00 2001
From: bagusajisaputroo <bagusajisaputro21@gmail.com>
Date: Mon, 5 May 2025 17:01:11 +0700
Subject: [PATCH 07/15] fix styling filter

---
 src/pages/wallet/wallet-history/blocks/ListToolbar.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
index 6e2c9a2..e173f59 100644
--- a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
+++ b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
@@ -155,7 +155,7 @@ const ListToolbar = () => {
               />
             </label>
 
-            <label className="input input-sm w-1/3">
+            <label className="input input-sm w-[160px]">
               <KeenIcon icon="magnifier" />
               <input
                 type="text"
@@ -179,10 +179,7 @@ const ListToolbar = () => {
                 </SelectContent>
               </Select>
             </div>
-          </div>
-
-          <div className="flex gap-3 items-center">
-          <DefaultTooltip title={'Reset Filter'} placement={'top'}>
+            <DefaultTooltip title={'Reset Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
@@ -191,6 +188,9 @@ const ListToolbar = () => {
                 <KeenIcon icon="arrow-circle-left" />
               </Button>
             </DefaultTooltip>
+          </div>
+
+          <div className="flex gap-3 items-center">
             <DefaultTooltip title={'Refresh'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={handleRefresh}>
                 <KeenIcon icon="arrows-circle" />

From a3051ccf921684f2bb13b9776c203bc9c4f5070c Mon Sep 17 00:00:00 2001
From: Raja Oktafrianto <rajaoktafrianto3.com>
Date: Mon, 5 May 2025 18:28:32 +0700
Subject: [PATCH 08/15] delete "forgot password"

---
 src/auth/pages/jwt/Login.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/auth/pages/jwt/Login.tsx b/src/auth/pages/jwt/Login.tsx
index f8c0a64..f15ae46 100644
--- a/src/auth/pages/jwt/Login.tsx
+++ b/src/auth/pages/jwt/Login.tsx
@@ -150,7 +150,7 @@ const Login = () => {
               />
               <span className="checkbox-label">Remember me</span>
             </label>
-            <Link
+            {/* <Link
               to={
                 currentLayout?.name === 'auth-branded'
                   ? '/auth/reset-password'
@@ -159,7 +159,7 @@ const Login = () => {
               className="text-2sm link shrink-0"
             >
               Forgot Password?
-            </Link>
+            </Link> */}
           </div>
 
           <button

From 69ebdc31ed598f06d9f9a3e603bddedfc27cd754 Mon Sep 17 00:00:00 2001
From: Wikzyy <alwi.erdi4@gmail.com>
Date: Tue, 6 May 2025 09:47:17 +0700
Subject: [PATCH 09/15] add button download template batch disbursement

---
 public/media/file-templates/batch-sample.xlsx | Bin 0 -> 9463 bytes
 .../blocks/ListToolbar.tsx                    |  23 ++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 public/media/file-templates/batch-sample.xlsx

diff --git a/public/media/file-templates/batch-sample.xlsx b/public/media/file-templates/batch-sample.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..25b7318ec2a9ef7154884dcbcb9e39a703efc9bd
GIT binary patch
literal 9463
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
E15tiim;e9(

literal 0
HcmV?d00001

diff --git a/src/pages/disbursement/history-transaction/blocks/ListToolbar.tsx b/src/pages/disbursement/history-transaction/blocks/ListToolbar.tsx
index 4b6c69f..f810d53 100644
--- a/src/pages/disbursement/history-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/disbursement/history-transaction/blocks/ListToolbar.tsx
@@ -3,6 +3,7 @@ import { useTransactionContext } from '../hooks/useTransactionContext';
 import { Button } from '@/components/ui/button';
 import { useCallback, useState, useEffect } from 'react';
 import { toast } from 'sonner';
+import { toAbsoluteUrl } from '@/utils';
 
 const ListToolbar = () => {
   const { table, reload } = useDataGrid();
@@ -23,8 +24,8 @@ const ListToolbar = () => {
     nextWeek.setDate(today.getDate() + 7);
 
     settrxDate({
-      from: formatDate(today),   // Set 'from' to today
-      to: formatDate(nextWeek),  // Set 'to' to 7 days later
+      from: formatDate(today), // Set 'from' to today
+      to: formatDate(nextWeek) // Set 'to' to 7 days later
     });
   }, []);
 
@@ -37,6 +38,15 @@ const ListToolbar = () => {
     }
   }, [trxDate, table]);
 
+  const handleExportData = () => {
+    const link = document.createElement('a');
+    link.href = toAbsoluteUrl('/media/file-templates/batch-sample.xlsx');
+    link.download = 'upload-batch-template.xlsx';
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  };
+
   useEffect(() => {
     if (trxDate.from && trxDate.to) {
       handleFilterData();
@@ -55,6 +65,15 @@ const ListToolbar = () => {
             >
               Upload Batch
             </Button>
+            <DefaultTooltip title={'Download Template'} placement={'top'}>
+              <Button onClick={handleExportData} className="h-7.5" variant={'outline'}>
+                <img
+                  src={toAbsoluteUrl('/media/file-types/xls.svg')}
+                  className="dark:hidden h-5"
+                  alt="Export to Excel"
+                />
+              </Button>
+            </DefaultTooltip>
             <DefaultTooltip title={'Refresh'} placement={'top'}>
               <Button variant="outline" className="h-7.5" onClick={() => reload()}>
                 <KeenIcon icon="arrows-circle" />

From 49f32883f72799d083a2ca7ed28a86006160d352 Mon Sep 17 00:00:00 2001
From: bagusajisaputroo <bagusajisaputro21@gmail.com>
Date: Tue, 6 May 2025 10:33:56 +0700
Subject: [PATCH 10/15] fix toolbar on transfer type + wallet history

---
 .../transferfee/blocks/ListToolBar.tsx        |  4 +-
 .../transfertype/blocks/ListToolBar.tsx       | 48 +++++++++++--------
 .../hooks/ManageTransferTypeContext.tsx       |  4 +-
 .../wallet-history/blocks/ListToolbar.tsx     |  5 +-
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/pages/transfer/transferfee/blocks/ListToolBar.tsx b/src/pages/transfer/transferfee/blocks/ListToolBar.tsx
index 9acdc39..c0a52c5 100644
--- a/src/pages/transfer/transferfee/blocks/ListToolBar.tsx
+++ b/src/pages/transfer/transferfee/blocks/ListToolBar.tsx
@@ -11,7 +11,7 @@
         <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
           <div className="flex justify-between w-full items-center">
             <div className="flex w-[50%] gap-3 items-center">
-              <label className="input input-sm w-1/3">
+              {/* <label className="input input-sm w-1/3">
                 <KeenIcon icon="magnifier" />
                 <input
                   type="text"
@@ -19,7 +19,7 @@
                   value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
                   onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
                 />
-              </label>
+              </label> */}
             </div>
             <div className="flex gap-3 items-center">
               <Button
diff --git a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
index 308c074..3580abb 100644
--- a/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
+++ b/src/pages/transfer/transfertype/blocks/ListToolBar.tsx
@@ -59,21 +59,28 @@ const ListToolbar = () => {
   const unique = (arr: string[]) => Array.from(new Set(arr));
   const types = unique(transferTypes.map((t) => t.type));
 
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    if (event.key === 'Enter') {
+      table.getColumn('name')?.setFilterValue(searchValue);
+      table.setPageIndex(0);
+    }
+  };
+  
   useEffect(() => {
     const timer = setTimeout(() => {
       table.getColumn('name')?.setFilterValue(searchValue);
       table.setPageIndex(0);
     }, 200);
     return () => clearTimeout(timer);
-  }, [searchValue]);
+  }, [searchValue, table]);
 
   useEffect(() => {
     table.getColumn('type')?.setFilterValue(statusTypes);
-  }, [statusTypes]);
+  }, [statusTypes, table]);
 
   useEffect(() => {
     table.getColumn('status_approval')?.setFilterValue(approval);
-  }, [approval]);
+  }, [approval, table]);
 
   const fetchTransferTypes = async () => {
     try {
@@ -114,16 +121,19 @@ const ListToolbar = () => {
       <div className="flex flex-wrap gap-1 w-full">
         <div className="flex justify-between w-full items-center mb-3">
           <div className="flex flex-nowrap items-end gap-3 w-full overflow-x-auto">
-            <div className="w-48 shrink-0">
-              <label className="input input-sm w-full text-sm">
+            {/* Fixed Search Input dengan icon yang selalu terlihat */}
+            <div className="relative w-48 shrink-0">
+              <div className="absolute left-3 top-1/2 transform -translate-y-1/2 pointer-events-none ">
                 <KeenIcon icon="magnifier" />
-                <input
-                  type="text"
-                  placeholder="Search Name"
-                  value={searchValue}
-                  onChange={(e) => setSearchValue(e.target.value)}
-                />
-              </label>
+              </div>
+              <input
+                type="text"
+                placeholder="Search Name"
+                value={searchValue}
+                onChange={(e) => setSearchValue(e.target.value)}
+                className="input input-sm  w-full pl-9 text-ellipsis overflow-hidden"
+                onKeyDown={handleKeyDown}
+              />
             </div>
 
             <div className="min-w-[220px] shrink-0">
@@ -132,8 +142,8 @@ const ListToolbar = () => {
                 value={statusTypes}
                 onValueChange={setStatusTypes}
               >
-                <SelectTrigger className="h-8 text-sm">
-                  <SelectValue placeholder="Select Status Transaction Type" />
+                <SelectTrigger className="h-8">
+                  <SelectValue placeholder="Select Status Transaction Type" className="text-ellipsis overflow-hidden" />
                 </SelectTrigger>
                 <SelectContent className="max-h-64 overflow-y-auto">
                   {types.map((opt) => (
@@ -151,8 +161,8 @@ const ListToolbar = () => {
                 value={approval}
                 onValueChange={setApproval}
               >
-                <SelectTrigger className="h-8 text-sm">
-                  <SelectValue placeholder="Select Status Approval" />
+                <SelectTrigger className="h-8">
+                  <SelectValue placeholder="Select Status Approval" className="text-ellipsis overflow-hidden" />
                 </SelectTrigger>
                 <SelectContent className="max-h-64 overflow-y-auto">
                   <SelectItem value="Y" className="truncate">
@@ -167,7 +177,7 @@ const ListToolbar = () => {
             <DefaultTooltip title={'Reset Filter'} placement={'top'}>
               <Button
                 variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
+                className="h-7.5 disabled:bg-gray-400 shrink-0"
                 onClick={handleClearFilter}
               >
                 <KeenIcon icon="arrow-circle-left" />
@@ -175,7 +185,7 @@ const ListToolbar = () => {
             </DefaultTooltip>
           </div>
 
-          <div className="flex gap-2 items-center">
+          <div className="flex gap-2 items-center ml-2 shrink-0">
             <Button
               variant="outline"
               className="h-8 px-3 text-xs"
@@ -196,4 +206,4 @@ const ListToolbar = () => {
   );
 };
 
-export default ListToolbar;
+export default ListToolbar;
\ No newline at end of file
diff --git a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
index 8ae1aed..55fa2a6 100644
--- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
+++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
@@ -212,7 +212,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
         header: ({ column }) => (
           <DataGridColumnHeader title="Status Transaction Type" column={column} />
         ),
-        enableSorting: true,
+        enableSorting: false,
         enableHiding: false,
         meta: { headerClassName: 'w-[250px]' }
       },
@@ -241,7 +241,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
         header: ({ column }) => (
           <DataGridColumnHeader title="Status Kind" column={column} />
         ),
-        enableSorting: true,
+        enableSorting: false,
         enableHiding: false,
         meta: { headerClassName: 'w-[250px]' }
       },
diff --git a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
index e173f59..b5775c1 100644
--- a/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
+++ b/src/pages/wallet/wallet-history/blocks/ListToolbar.tsx
@@ -162,6 +162,7 @@ const ListToolbar = () => {
                 placeholder="Search MSISDN"
                 value={searchValue}
                 onChange={(e) => setSearchValue(e.target.value)}
+                className="overflow-hidden text-ellipsis w-full"
               />
             </label>
 
@@ -182,7 +183,7 @@ const ListToolbar = () => {
             <DefaultTooltip title={'Reset Filter'} placement={'top'}>
               <Button
                 variant="outline"
-                className="h-7.5 disabled:bg-gray-400"
+                className="h-8 disabled:bg-gray-400"
                 onClick={handleClearAllFilters}
               >
                 <KeenIcon icon="arrow-circle-left" />
@@ -203,4 +204,4 @@ const ListToolbar = () => {
   );
 };
 
-export default ListToolbar;
+export default ListToolbar;
\ No newline at end of file

From c255e59733f7c874feabdfe63d971508bae3528c Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 6 May 2025 11:00:04 +0700
Subject: [PATCH 11/15] update filter

---
 .../approval-transaction/blocks/ListToolbar.tsx      |  8 ++++----
 .../hooks/ApprovalTransactionContext.tsx             | 12 ++++++++++++
 .../history-transaction/blocks/ListToolbar.tsx       |  8 ++++----
 .../history-transaction/hooks/TransactionContext.tsx | 12 ++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
index 2bf79e0..d90d765 100644
--- a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
@@ -40,9 +40,9 @@ const ListToolbar = () => {
   // useEffect to set the default date values
   useEffect(() => {
     const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+    // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
     settrxDate({
-      from: formatDate(firstDayOfMonth),
+      from: formatDate(today),
       to: formatDate(today),
     });
   }, []);
@@ -136,13 +136,13 @@ const ListToolbar = () => {
               className="h-7.5"
               onClick={() => {
                 const today = new Date();
-                const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+                // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
 
                 // Resetting all filters
                 setSearchValue('');
                 setStatusApproval('');
                 settrxDate({
-                  from: formatDate(firstDayOfMonth),
+                  from: formatDate(today),
                   to: formatDate(today),
                 });
 
diff --git a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
index 163055a..a015999 100644
--- a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
+++ b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
@@ -282,6 +282,18 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
         formattedFilter["Transactions.code"] = { like: `%${transactioncode}%` };
       }
 
+      if (transactioncode) {
+        formattedFilter["Transactions.msisdn"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
+      if (transactioncode) {
+        formattedFilter["Transactions.fullname"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
       // Handle approval status filter
       formattedFilter["Transactions.status_approve"] = approvalstatus
         ? approvalstatus
diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
index f50e3ce..71e6e11 100644
--- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
@@ -61,9 +61,9 @@ const ListToolbar = () => {
 
   useEffect(() => {
     const today = new Date();
-    const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+    // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
     settrxDate({
-      from: formatDate(firstDayOfMonth),
+      from: formatDate(today),
       to: formatDate(today),
     });
   }, []);
@@ -167,14 +167,14 @@ const ListToolbar = () => {
               onClick={() => {
                 // Preserve trxDate values (from, to) and reset others
                 const today = new Date();
-                const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+                // const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
 
                 // Only reset filters excluding from and to
                 setSearchValue('');
                 // setStatusValue('');
                 setTypeValue('');
                 settrxDate({
-                  from: formatDate(firstDayOfMonth),
+                  from: formatDate(today),
                   to: formatDate(today),
                 });
 
diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
index 76f018c..6bef783 100644
--- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
@@ -279,6 +279,18 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
         };
       }
 
+      if (transactioncode) {
+        formattedFilter["Transactions.msisdn"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
+      if (transactioncode) {
+        formattedFilter["Transactions.fullname"] = {
+          like: `%${transactioncode}%`
+        };
+      }
+
       // if (transactionstatus) {
       //   formattedFilter["Transactions.status"] = transactionstatus;
       // }

From 202b0806c6e7b4e6a58ef462cb9f8809d27ae2b7 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 6 May 2025 11:00:59 +0700
Subject: [PATCH 12/15] update filter

---
 .../transaction/approval-transaction/blocks/ListToolbar.tsx     | 2 +-
 .../transaction/history-transaction/blocks/ListToolbar.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
index d90d765..e5f74f2 100644
--- a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx
@@ -121,7 +121,7 @@ const ListToolbar = () => {
             <KeenIcon icon="magnifier" />
             <input
               type="text"
-              placeholder="Search Transaction ID"
+              placeholder="Search Transaction ID, MSISDN, Or Full Name Customer"
               value={searchValue}
               onChange={(event) => setSearchValue(event.target.value)}
             />
diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
index 71e6e11..a37670b 100644
--- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
+++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx
@@ -152,7 +152,7 @@ const ListToolbar = () => {
             <KeenIcon icon="magnifier" />
             <input
               type="text"
-              placeholder="Search Transaction ID"
+              placeholder="Search Transaction ID, MSISDN, Or Full Name Customer"
               value={searchValue}
               onChange={(event) => setSearchValue(event.target.value)}
             />

From 464d97d39ebc373f651bc31cd5794eadbae3d9d3 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 6 May 2025 11:12:01 +0700
Subject: [PATCH 13/15] update dashboard view

---
 src/pages/dashboards/home/blocks/MemberActivity.tsx           | 2 +-
 src/pages/dashboards/home/blocks/TransactionPieChart.tsx      | 2 +-
 src/pages/dashboards/home/blocks/TransactionValue.tsx         | 2 +-
 .../approval-transaction/hooks/ApprovalTransactionContext.tsx | 4 ++--
 .../history-transaction/hooks/TransactionContext.tsx          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/dashboards/home/blocks/MemberActivity.tsx b/src/pages/dashboards/home/blocks/MemberActivity.tsx
index 4c3c70f..79c998d 100644
--- a/src/pages/dashboards/home/blocks/MemberActivity.tsx
+++ b/src/pages/dashboards/home/blocks/MemberActivity.tsx
@@ -53,7 +53,7 @@ const MemberActivity = ({ startdate, enddate }: Props) => {
     const arcY = 50 - radius * Math.sin(arcAngle);
 
     return (
-        <div className="p-6 bg-white rounded-lg shadow-md w-full max-w-xl">
+        <div className="p-6 bg-white rounded-lg shadow-md w-1/3">
             <div className="flex justify-between items-center pb-3 mb-4">
                 <h2 className="text-lg font-semibold text-gray-700">Member Activity</h2>
             </div>
diff --git a/src/pages/dashboards/home/blocks/TransactionPieChart.tsx b/src/pages/dashboards/home/blocks/TransactionPieChart.tsx
index 580e0d3..5e2f3b5 100644
--- a/src/pages/dashboards/home/blocks/TransactionPieChart.tsx
+++ b/src/pages/dashboards/home/blocks/TransactionPieChart.tsx
@@ -46,7 +46,7 @@ const TransactionPieChart = ({ startdate, enddate }: Props) => {
         ];        
 
     return (
-        <div className="bg-white rounded-lg shadow-md p-6 w-full max-w-md">
+        <div className="bg-white rounded-lg shadow-md p-6 w-1/3">
             <div className="flex justify-between items-center mb-4">
                 <h2 className="text-lg font-semibold text-gray-700">Transaction Chart</h2>
             </div>
diff --git a/src/pages/dashboards/home/blocks/TransactionValue.tsx b/src/pages/dashboards/home/blocks/TransactionValue.tsx
index 1d6a73a..5c69564 100644
--- a/src/pages/dashboards/home/blocks/TransactionValue.tsx
+++ b/src/pages/dashboards/home/blocks/TransactionValue.tsx
@@ -80,7 +80,7 @@ const TransactionValue = ({ startdate, enddate }: Props) => {
     const maxValue = transactionData.length > 0 ? Math.max(...transactionData.map(item => item.value)) : 1;
 
     return (
-        <div className="bg-white rounded-xl shadow p-6 w-full max-w-md">
+        <div className="bg-white rounded-xl shadow p-6 w-1/3">
             <div className="flex justify-between items-center mb-4">
                 <h2 className="text-lg font-semibold text-gray-800">Transaction Value</h2>
             </div>
diff --git a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
index a015999..4308695 100644
--- a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
+++ b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
@@ -284,13 +284,13 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
 
       if (transactioncode) {
         formattedFilter["Transactions.msisdn"] = {
-          like: `%${transactioncode}%`
+          like: `${transactioncode}`
         };
       }
 
       if (transactioncode) {
         formattedFilter["Transactions.fullname"] = {
-          like: `%${transactioncode}%`
+          like: `${transactioncode}`
         };
       }
 
diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
index 6bef783..038103a 100644
--- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
@@ -281,13 +281,13 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
 
       if (transactioncode) {
         formattedFilter["Transactions.msisdn"] = {
-          like: `%${transactioncode}%`
+          like: `${transactioncode}`
         };
       }
 
       if (transactioncode) {
         formattedFilter["Transactions.fullname"] = {
-          like: `%${transactioncode}%`
+          like: `${transactioncode}`
         };
       }
 

From 896c472ce8976bb014368f0d56f3575cbbc6b0f9 Mon Sep 17 00:00:00 2001
From: Wikzyy <alwi.erdi4@gmail.com>
Date: Tue, 6 May 2025 13:17:57 +0700
Subject: [PATCH 14/15] add submitting handler on disbursement upload batch

---
 .../blocks/UploadBatchDialog.tsx              | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/pages/disbursement/history-transaction/blocks/UploadBatchDialog.tsx b/src/pages/disbursement/history-transaction/blocks/UploadBatchDialog.tsx
index 237a72e..e6ccabf 100644
--- a/src/pages/disbursement/history-transaction/blocks/UploadBatchDialog.tsx
+++ b/src/pages/disbursement/history-transaction/blocks/UploadBatchDialog.tsx
@@ -24,6 +24,7 @@ import { toast } from 'sonner';
 import { useCallApi } from '@/hooks';
 import { doSaveLogActivity } from '@/actions/GlobalActions';
 import clsx from 'clsx';
+import { RefreshCw } from 'lucide-react';
 
 const API_URL = apiConfig.service_disbursement;
 
@@ -32,17 +33,18 @@ const UploadBatchDialog = () => {
   const { showUploadBatchDialog, handleUploadBatchDialog } = useTransactionContext();
   const { reload } = useDataGrid();
   const { PostData, PostDataFile, GetData } = useCallApi();
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const [alert, setAlert] = useState({
     show: false,
     message: ''
   });
   const initialState: {
-    execution_date: string,
+    execution_date: string;
     file: File | null;
   } = {
     execution_date: '',
     file: null
-  }
+  };
   const [formField, setFormField] = useState(initialState);
 
   const resetForm = () => {
@@ -54,31 +56,33 @@ const UploadBatchDialog = () => {
   const doUploadBatch = useCallback(
     async (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
-  
+      setIsSubmitting(true);
+
       const formData = new FormData();
       formData.append('execution_date', formField.execution_date);
+
       if (formField.file) {
         formData.append('file', formField.file);
       }
-  
+
       try {
         const response = await PostDataFile(`${API_URL}/upload-excel`, formData, {
           headers: {
             'Content-Type': 'multipart/form-data'
           }
         });
-  
+
         if (response?.status) {
           handleUploadBatchDialog(false);
           resetForm();
           reload();
-  
+
           const createActivity = {
             module: 'Disbursement',
             description: `Create New Disbursement => ${formField.file?.name}`,
             action: 'C'
           };
-  
+
           doSaveLogActivity(createActivity);
           toast.success('Success Create Disbursement');
         } else {
@@ -88,6 +92,8 @@ const UploadBatchDialog = () => {
       } catch (error) {
         toast.error('Error uploading batch');
         setAlert({ show: true, message: 'Something went wrong. Please try again.' });
+      } finally {
+        setIsSubmitting(false);
       }
     },
     [formField]
@@ -98,10 +104,7 @@ const UploadBatchDialog = () => {
 
     console.log('Form data before submit:', formField);
 
-    if (
-      formField.execution_date.trim() === '' || 
-      formField.file === null
-    ) {
+    if (formField.execution_date.trim() === '' || formField.file === null) {
       setAlert({ show: true, message: 'Please fill in all required fields.' });
       return;
     }
@@ -110,7 +113,7 @@ const UploadBatchDialog = () => {
     // console.log(formField);
     setAlert({ show: false, message: '' });
   };
-  
+
   useEffect(() => {
     if (showUploadBatchDialog === false) {
       resetForm();
@@ -150,7 +153,9 @@ const UploadBatchDialog = () => {
               <div className="card-body grid gap-5 p-0">
                 <div className="w-full">
                   <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label className="form-label flex items-center gap-1 max-w-56">Execution Date</label>
+                    <label className="form-label flex items-center gap-1 max-w-56">
+                      Execution Date
+                    </label>
                     <Input
                       className="input"
                       type="datetime-local"
@@ -167,19 +172,23 @@ const UploadBatchDialog = () => {
                   <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label className="form-label flex items-center gap-1 max-w-56">File</label>
                     <Input
-                        className="input"
-                        type="file"
-                        autoComplete="off"
-                        required
-                        onChange={({ target }) =>
-                            setFormField((prev) => ({ ...prev, file: target.files?.[0] ?? null }))
-                        }
+                      className="input"
+                      type="file"
+                      autoComplete="off"
+                      required
+                      onChange={({ target }) =>
+                        setFormField((prev) => ({ ...prev, file: target.files?.[0] ?? null }))
+                      }
                     />
                   </div>
                 </div>
                 <div className="flex justify-end pt-2.5">
-                  <Button className="btn btn-primary" type="submit">
-                    Save Changes
+                  <Button variant="default" type="submit" disabled={isSubmitting}>
+                    {isSubmitting ? (
+                      <RefreshCw className="animate-spin h-8 w-8 text-white mx-3" />
+                    ) : (
+                      'Submit'
+                    )}
                   </Button>
                 </div>
               </div>

From 4d0d6fd039ce6b7e9c6f51c34ac9ed7b8eda7c1f Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 6 May 2025 15:42:51 +0700
Subject: [PATCH 15/15] update

---
 .../blocks/DetailApprovalTransaction.tsx      |  36 +++--
 .../hooks/ApprovalTransactionContext.tsx      |  25 ++--
 .../blocks/DetailTransaction.tsx              | 136 +++++++++++-------
 .../hooks/TransactionContext.tsx              |  25 +---
 4 files changed, 125 insertions(+), 97 deletions(-)

diff --git a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
index 35756d2..eb72ba9 100644
--- a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
@@ -202,14 +202,20 @@ const DetailApprovalTransaction = () => {
 
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase?.amount) ?? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.transfer.amount)}</p>
+                                        <p className="font-medium">
+                                            {(transactionDetails?.purchase?.amount ?? transactionDetails?.transfer?.amount) != null
+                                                ? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                    transactionDetails.purchase?.amount ?? transactionDetails.transfer?.amount
+                                                )
+                                                : "-"}
+                                        </p>
                                     </div>
+
                                     <div>
                                         <p className="text-sm text-gray-500">Fee</p>
                                         <p className="font-medium">
-                                            {transactionDetails?.kind === 'P'
-                                                ? transactionDetails?.purchase.fee_amount.toLocaleString('en-US', { style: 'currency', currency: 'USD' })
-                                                : transactionDetails?.transfer.fee_amount.toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
+                                            {(transactionDetails?.transfer?.fee_amount ?? transactionDetails?.purchase?.fee_amount ?? 0)
+                                                .toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
                                         </p>
                                     </div>
                                     <div>
@@ -290,19 +296,33 @@ const DetailApprovalTransaction = () => {
                                 <div className="grid grid-cols-2 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.amount)}</p>
+                                        <p className="font-medium">
+                                            {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                transactionDetails?.purchase?.amount ?? transactionDetails?.transfer?.amount ?? 0
+                                            )}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Cashback</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.cashback)}</p>
+                                        <p className="font-medium">
+                                            {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                transactionDetails?.purchase?.cashback ?? transactionDetails?.transfer?.cashback ?? 0
+                                            )}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Cashback Point</p>
-                                        <p className="font-medium">{transactionDetails?.purchase.cashback_point}</p>
+                                        <p className="font-medium">
+                                            {transactionDetails?.purchase?.cashback_point ?? transactionDetails?.transfer?.cashback_point ?? 0}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Fee Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.fee_amount)}</p>
+                                        <p className="font-medium">
+                                            {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                transactionDetails?.purchase?.fee_amount ?? transactionDetails?.transfer?.fee_amount ?? 0
+                                            )}
+                                        </p>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
index 4308695..f1cfb9f 100644
--- a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
+++ b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
@@ -270,28 +270,19 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
         });
       }
 
-      // Constructing filter object with dynamic properties
       const formattedFilter: any = {
         "Transactions.transaction_date": {
           from: `${startdate} 00:00:00`,
-          to: `${enddate} 23:59:59`,
-        },
+          to: `${enddate} 23:59:59`
+        }
       };
-
+      
       if (transactioncode) {
-        formattedFilter["Transactions.code"] = { like: `%${transactioncode}%` };
-      }
-
-      if (transactioncode) {
-        formattedFilter["Transactions.msisdn"] = {
-          like: `${transactioncode}`
-        };
-      }
-
-      if (transactioncode) {
-        formattedFilter["Transactions.fullname"] = {
-          like: `${transactioncode}`
-        };
+        formattedFilter["$or"] = [
+          { "Transactions.code": { like: `%${transactioncode}%` } },
+          { "Transactions.msisdn": { like: `${transactioncode}` } },
+          { "origin_customer.fullname": { like: `${transactioncode}` } }
+        ];
       }
 
       // Handle approval status filter
diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
index decf631..976ec28 100644
--- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
+++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
@@ -49,7 +49,7 @@ const DetailTransaction = () => {
                         id: selectedTransactionId
                     });
                     setTransactionDetails(response?.data);
-                    // console.log(response?.data.origin_customer.id);
+                    // console.log(response?.data);
                     // console.log(selectedTransactionId);
                 } catch (error) {
                     console.error('Error fetching transaction', error);
@@ -221,14 +221,20 @@ const DetailTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase?.amount) ?? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.transfer.amount)}</p>
+                                        <p className="font-medium">
+                                            {(transactionDetails?.purchase?.amount ?? transactionDetails?.transfer?.amount) != null
+                                                ? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                    transactionDetails.purchase?.amount ?? transactionDetails.transfer?.amount
+                                                )
+                                                : "-"}
+                                        </p>
                                     </div>
+
                                     <div>
                                         <p className="text-sm text-gray-500">Fee</p>
                                         <p className="font-medium">
-                                            {transactionDetails?.kind === 'P'
-                                                ? transactionDetails?.purchase.fee_amount.toLocaleString('en-US', { style: 'currency', currency: 'USD' })
-                                                : transactionDetails?.transfer.fee_amount.toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
+                                            {(transactionDetails?.transfer?.fee_amount ?? transactionDetails?.purchase?.fee_amount ?? 0)
+                                                .toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
                                         </p>
                                     </div>
                                     <div>
@@ -299,69 +305,91 @@ const DetailTransaction = () => {
                                 <div className="grid grid-cols-2 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.amount)}</p>
+                                        <p className="font-medium">
+                                            {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                transactionDetails?.purchase?.amount ?? transactionDetails?.transfer?.amount ?? 0
+                                            )}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Cashback</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.cashback)}</p>
+                                        <p className="font-medium">
+                                            {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                transactionDetails?.purchase?.cashback ?? transactionDetails?.transfer?.cashback ?? 0
+                                            )}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Cashback Point</p>
-                                        <p className="font-medium">{transactionDetails?.purchase.cashback_point}</p>
+                                        <p className="font-medium">
+                                            {transactionDetails?.purchase?.cashback_point ?? transactionDetails?.transfer?.cashback_point ?? 0}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Fee Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.fee_amount)}</p>
-                                    </div>
-                                </div>
-                            </div>
-                        )}
-                        {activeTab === 'detail' && transactionDetails?.kind === 'P' && (
-                            <div className="space-y-4">
-                                <h3 className="font-semibold flex items-center">
-                                    Product Information
-                                    <span className="ml-2 bg-blue-100 text-blue-800 text-xs font-semibold mr-2 px-2.5 py-0.5 rounded">
-                                        Product Info
-                                    </span>
-                                </h3>
-                                <div className="grid grid-cols-2 gap-4">
-                                    <div>
-                                        <p className="text-sm text-gray-500">Product Name</p>
-                                        <p className="font-medium">{transactionDetails?.purchase.product.name}</p>
-                                    </div>
-                                    <div>
-                                        <p className="text-sm text-gray-500">Price Cash</p>
-                                        {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.product.price_cash)}
-                                    </div>
-                                    <div>
-                                        <p className="text-sm text-gray-500">Price Point</p>
-                                        <p className="font-medium">{transactionDetails?.purchase.product.price_point}</p>
-                                    </div>
-                                    <div>
-                                        <p className="text-sm text-gray-500">Product Type</p>
-                                        <p className="font-medium">{transactionDetails?.purchase.product.type}</p>
-                                    </div>
-                                    <div>
-                                        <p className="text-sm text-gray-500">Provider Name</p>
-                                        <p className="font-medium">{transactionDetails?.purchase.product.provider.description}</p>
-                                    </div>
-                                    <div>
-                                        <p className="text-sm text-gray-500">Provider Type</p>
                                         <p className="font-medium">
-                                            {(() => {
-                                                let providertype;
-                                                if (transactionDetails?.purchase.product.provider.type === 'h2h') {
-                                                    providertype = 'HOST TO HOST';
-                                                } else if (transactionDetails?.purchase.product.provider.type === 'agent') {
-                                                    providertype = 'AGENT';
-                                                }
-                                                return providertype;
-                                            })()}
+                                            {new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(
+                                                transactionDetails?.purchase?.fee_amount ?? transactionDetails?.transfer?.fee_amount ?? 0
+                                            )}
                                         </p>
                                     </div>
                                 </div>
                             </div>
                         )}
+                        {/* {activeTab === 'detail' && transactionDetails?.kind === 'P' && ( */}
+                        <div className="space-y-4">
+                            <h3 className="font-semibold flex items-center">
+                                Product Information
+                                <span className="ml-2 bg-blue-100 text-blue-800 text-xs font-semibold mr-2 px-2.5 py-0.5 rounded">
+                                    Product Info
+                                </span>
+                            </h3>
+                            <div className="grid grid-cols-2 gap-4">
+                                <div>
+                                    <p className="text-sm text-gray-500">Product Name</p>
+                                    <p className="font-medium">
+                                        {transactionDetails?.purchase?.product?.name ?? "-"}
+                                    </p>
+                                </div>
+                                <div>
+                                    <p className="text-sm text-gray-500">Price Cash</p>
+                                    <p className="font-medium">
+                                        {transactionDetails?.purchase?.product?.price_cash != null
+                                            ? new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" }).format(transactionDetails.purchase.product.price_cash)
+                                            : "-"}
+                                    </p>
+                                </div>
+                                <div>
+                                    <p className="text-sm text-gray-500">Price Point</p>
+                                    <p className="font-medium">
+                                        {transactionDetails?.purchase?.product?.price_point ?? "-"}
+                                    </p>
+                                </div>
+                                <div>
+                                    <p className="text-sm text-gray-500">Product Type</p>
+                                    <p className="font-medium">
+                                        {transactionDetails?.purchase?.product?.type ?? "-"}
+                                    </p>
+                                </div>
+                                <div>
+                                    <p className="text-sm text-gray-500">Provider Name</p>
+                                    <p className="font-medium">
+                                        {transactionDetails?.purchase?.product?.provider?.description ?? "-"}
+                                    </p>
+                                </div>
+                                <div>
+                                    <p className="text-sm text-gray-500">Provider Type</p>
+                                    <p className="font-medium">
+                                        {transactionDetails?.purchase?.product?.provider?.type === "h2h"
+                                            ? "HOST TO HOST"
+                                            : transactionDetails?.purchase?.product?.provider?.type === "agent"
+                                                ? "AGENT"
+                                                : "-"}
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                        {/* )} */}
 
                         {activeTab === 'detail' && transactionDetails?.kind != 'P' && transactionDetails?.transfer != null && (
                             <div className="space-y-4">
@@ -397,7 +425,7 @@ const DetailTransaction = () => {
                                     <div>
                                         <p className="text-sm text-gray-500">Fee</p>
                                         <p className="font-medium">
-                                            {transactionDetails?.transfer.fee_amount.toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
+                                            {(transactionDetails?.transfer?.fee_amount ?? transactionDetails?.purchase?.fee_amount ?? 0).toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
                                         </p>
                                     </div>
                                     <div>
diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
index 038103a..f0063e2 100644
--- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
@@ -265,30 +265,19 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
         });
       }
 
-      // Build filter object dynamically
       const formattedFilter: any = {
         "Transactions.transaction_date": {
           from: `${startdate} 00:00:00`,
           to: `${enddate} 23:59:59`
         }
       };
-
+      
       if (transactioncode) {
-        formattedFilter["Transactions.code"] = {
-          like: `%${transactioncode}%`
-        };
-      }
-
-      if (transactioncode) {
-        formattedFilter["Transactions.msisdn"] = {
-          like: `${transactioncode}`
-        };
-      }
-
-      if (transactioncode) {
-        formattedFilter["Transactions.fullname"] = {
-          like: `${transactioncode}`
-        };
+        formattedFilter["$or"] = [
+          { "Transactions.code": { like: `%${transactioncode}%` } },
+          { "Transactions.msisdn": { like: `${transactioncode}` } },
+          { "origin_customer.fullname": { like: `${transactioncode}` } }
+        ];
       }
 
       // if (transactionstatus) {
@@ -298,7 +287,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
       if (type) {
         formattedFilter["Transactions.kind"] = type;
       }
-
+      
       const response = await GetData(`${API_URL}/transaction/history`, {
         limit,
         page: page + 1,