fixing AddDialog + Managetransfertype on transactiontype

src/pages/transfer/transfertype/blocks/AddDialog.tsx

@@ -41,8 +41,8 @@ import {
 } from '@/components/ui/command';
 
 interface WalletProps {
-  Wallet_id: string;
+  id: string;
-  Wallet_name: string;
+  name: string;
 }
 
 interface CustomerProps {
@@ -74,8 +74,8 @@ const AddDialog = () => {
     description: '',
     wallet_origin: '',
     wallet_destination: '',
-    wallet_fee_destination: '',
+
-    customer_fee_destination: '',
+
     minimum_amount: 0,
     maximum_amount: 0,
     max_transaction_per_day: 0,
@@ -102,8 +102,6 @@ const AddDialog = () => {
       'description',
       'wallet_origin',
       'wallet_destination',
-      'wallet_fee_destination',
-      'customer_fee_destination',
       'status',
       'status_approval'
     ];
@@ -216,13 +214,11 @@ const AddDialog = () => {
       limit: 100,
       page: 1,
       with_deleted: false,
-      order_field: 'name',
+      order_field: 'wallets.name',
       order_direction: 'ASC',
-      filter: JSON.stringify({
-        status: 'Y'
-      })
     };
     const response = await GetData(`${API_URL_MASTERDATA}/wallet/list`, params);
+    console.log(response)
     if (response?.status && response?.data) {
       setWallets(response.data.list);
     } else {
@@ -262,9 +258,11 @@ const AddDialog = () => {
         <DialogBody className="scrollable-y px-0 pb-0" ref={parentRef}>
           <div className="flex flex-col px-0">
             {alert.show && (
-              <Alert variant="danger" className="mb-3">
+        <div className="sticky top-0 z-10 bg-white p-3">
-                <h3>{alert.message}</h3>
+        <Alert variant="danger" className="mb-3">
-              </Alert>
+          <h3>{alert.message}</h3>
+        </Alert>
+      </div>
             )}
             <form action="" onSubmit={handleSubmit}>
               <div className="card-body grid gap-5 p-0">
@@ -396,8 +394,8 @@ const AddDialog = () => {
                         </SelectTrigger>
                         <SelectContent>
                           {wallets.map((wallet, idx) => (
-                            <SelectItem value={wallet.Wallet_id} key={wallet.Wallet_name}>
+                            <SelectItem value={wallet.id} key={wallet.name}>
-                              {wallet.Wallet_name}
+                              {wallet.name}
                             </SelectItem>
                           ))}
                         </SelectContent>
@@ -424,8 +422,8 @@ const AddDialog = () => {
                         </SelectTrigger>
                         <SelectContent>
                           {wallets.map((wallet, idx) => (
-                            <SelectItem value={wallet.Wallet_id} key={wallet.Wallet_id}>
+                            <SelectItem value={wallet.id} key={wallet.id}>
-                              {wallet.Wallet_name}
+                              {wallet.name}
                             </SelectItem>
                           ))}
                         </SelectContent>
@@ -433,86 +431,8 @@ const AddDialog = () => {
                     </div>
                   </div>
                 </div>
-                <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">
-                      Wallet Destination Fee
-                      <span className="text-red-500">*</span>
-                    </label>
-                    <div className="grow">
-                      <Select
-                        value={formField.wallet_fee_destination}
-                        onValueChange={(wallet_fee_destination) =>
-                          setFormField((prev) => ({ ...prev, wallet_fee_destination }))
-                        }
-                      >
-                        <SelectTrigger>
-                          <SelectValue placeholder="Select Wallet" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {wallets.map((wallet, idx) => (
-                            <SelectItem value={wallet.Wallet_id} key={wallet.Wallet_id}>
-                              {wallet.Wallet_name}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                    </div>
-                  </div>
-                </div>
-                <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">
-                      Customer Fee Destination<span className="text-red-500">*</span>
-                    </label>
-                    <div className="grow">
-                      <Popover open={open} onOpenChange={setOpen}>
-                        <PopoverTrigger asChild>
-                          <button
-                            type="button"
-                            className="input col-span-5 text-left"
-                            style={{ color: 'inherit' }}
-                          >
-                            {customers.find(
-                              (customer) => customer.id === formField.customer_fee_destination
-                            )?.username || 'Select Customer'}
-                          </button>
-                        </PopoverTrigger>
-                        <PopoverContent className="w-[400px] p-0">
-                          <Command>
-                            <CommandInput placeholder="Search Customer..." />
-                            <CommandList
-                              className="max-h-[300px] overflow-y-auto"
-                              style={{ touchAction: 'pan-y' }}
-                              onWheel={(e) => {
-                                e.currentTarget.scrollTop += e.deltaY;
-                              }}
-                            >
-                              <CommandEmpty>No Customer found.</CommandEmpty>
-                              <CommandGroup>
-                                {customers.map((customer) => (
-                                  <CommandItem
-                                    key={customer.id}
-                                    value={customer.username}
-                                    onSelect={() => {
-                                      setFormField({
-                                        ...formField,
-                                        customer_fee_destination: customer.id
-                                      });
-                                      setOpen(false);
-                                    }}
-                                  >
-                                    {customer.username}
-                                  </CommandItem>
-                                ))}
-                              </CommandGroup>
-                            </CommandList>
-                          </Command>
-                        </PopoverContent>
-                      </Popover>
-                    </div>
-                  </div>
-                </div>
                 <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">

src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx

@@ -136,26 +136,6 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
         enableHiding: false,
         meta: { headerClassName: 'w-[250px]' }
       },
-      {
-        accessorFn: (row) => row.wallet_fee_destination.name,
-        id: 'wallet_fee_destination',
-        header: ({ column }) => (
-          <DataGridColumnHeader title="Wallet Fee Destination" column={column} />
-        ),
-        enableSorting: false,
-        enableHiding: false,
-        meta: { headerClassName: 'w-[250px]' }
-      },
-      {
-        accessorFn: (row) => row.customer_fee_destination?.username || 'N/A',
-        id: 'customer_fee_destination',
-        header: ({ column }) => (
-          <DataGridColumnHeader title="Customer Fee Destination" column={column} />
-        ),
-        enableSorting: false,
-        enableHiding: false,
-        meta: { headerClassName: 'w-[250px]' }
-      },
       {
         accessorFn: (row) => row.type,
         id: 'type',