diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx
index 1473bab..be6df33 100644
--- a/src/pages/members/kyc/Kyc.tsx
+++ b/src/pages/members/kyc/Kyc.tsx
@@ -5,8 +5,6 @@ import {
TDataGridProps,
useDataGrid
} from '@/components';
-import { DataTable } from '@/components/ui/DataTable';
-import { Table } from '@tanstack/react-table';
import React, { createContext, useContext, useState, useEffect } from 'react';
import { getColumns, initialMember } from './Columns';
import { useAuthContext } from '@/auth';
@@ -15,14 +13,13 @@ import { apiConfig } from '@/config/api.config';
import ConfirmDialog from '@/components/confirm';
import axios from 'axios';
import { toast } from 'sonner';
-const BASE_URL = apiConfig.service_customer;
-const BASE_URL_MASTER_DATA = apiConfig.service_master_data;
-// import CustomerDialog from '../manage-members/CustomerDetailModal';
import DetailMember from '../manage-members/blocks/DetailMember';
import { Breadcrumbs, Link } from '@mui/material';
import { Helmet } from 'react-helmet';
import { ListToolBar } from './blocks/ListToolBar';
import { RefreshCw } from 'lucide-react';
+const BASE_URL = apiConfig.service_customer;
+const BASE_URL_MASTER_DATA = apiConfig.service_master_data;
const Kyc = () => {
const [loading, setLoading] = useState(false);
@@ -33,12 +30,15 @@ const Kyc = () => {
const [dialogOpen, setDialogOpen] = useState(false);
const [dialogType, setDialogType] = useState('');
const [isReloading, setIsReloading] = useState(false);
- const closeDialog = () => setIsDialogOpen(false);
+ const closeDialog = () => {
+ setIsDialogOpen(false);
+ setMember(initialMember);
+ };
const { getUser } = useAuthContext();
useEffect(() => {
fetchCustomers();
- }, []);
+ }, [member]);
async function fetchCustomers() {
try {
@@ -95,10 +95,6 @@ const Kyc = () => {
setDialogOpen(true);
}
- const resetForm = () => {
- setMember(initialMember);
- };
-
const handleReload = () => {
setIsReloading(true);
fetchCustomers();
@@ -192,14 +188,6 @@ const Kyc = () => {
setIsDialogOpen(el);
}
- // const resetForm = () => {
- // setMember(initialMember);
- // };
-
- // useEffect(() => {
- // if (!isDialogOpen) resetForm();
- // }, [isDialogOpen]);
-
if (loading) return ;
return (
@@ -258,11 +246,11 @@ const Kyc = () => {
)}
}
+ columns={getColumns(handleUpdate)}
layout={{ card: true }}
sorting={[{ id: 'created_at', desc: true }]}
+ toolbar={}
serverSide={false}
onRowSelectionChange={(selected, table: any) => {
const selectedRow = table.getSelectedRowModel().rows[0];
diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx
index efe2788..5aeed77 100644
--- a/src/pages/members/manage-members/ManageMembers.tsx
+++ b/src/pages/members/manage-members/ManageMembers.tsx
@@ -10,12 +10,12 @@ import { Container, DataGridInner, LoaderTransparant } from '@/components';
import { DataGridProvider } from '@/components';
import { toast } from 'sonner';
import { Breadcrumbs, Link } from '@mui/material';
-const BASE_URL_MASTER_DATA = apiConfig.service_master_data;
-const BASE_URL_CUSTOMER = apiConfig.service_customer;
-const BASE_URL = apiConfig.service_customer;
import { Helmet } from 'react-helmet';
import ListToolbar from './blocks/ListToolBar';
import { RefreshCw } from 'lucide-react';
+const BASE_URL_MASTER_DATA = apiConfig.service_master_data;
+const BASE_URL_CUSTOMER = apiConfig.service_customer;
+const BASE_URL = apiConfig.service_customer;
const ManageMembers = () => {
const [loading, setLoading] = useState(false);
@@ -113,6 +113,7 @@ const ManageMembers = () => {
setIsReloading(true);
fetchCustomers();
};
+
const handleYes = async () => {
try {
setLoading(true);
diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx
index a1c4190..ffb4efc 100644
--- a/src/pages/members/manage-members/blocks/DetailMember.tsx
+++ b/src/pages/members/manage-members/blocks/DetailMember.tsx
@@ -1,7 +1,5 @@
import { apiConfig } from '@/config/api.config';
import { Alert, useDataGrid } from '@/components';
-import { useCallApi } from '@/hooks';
-import { getAuth } from '@/auth';
import axios from 'axios';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { toast } from 'sonner';
@@ -22,12 +20,12 @@ import {
} from '@/components/ui/select';
import { Input } from '@/components/ui/input';
import { Button } from '@/components/ui/button';
-const BASE_URL_MASTER_DATA = apiConfig.service_master_data;
-const URL_NATIONALITY = apiConfig.nationality;
-const BASE_URL_CUSTOMER = apiConfig.service_customer;
import { initialMember } from "../Columns";
import AdmAccess from './AdmAccess';
import CustomerWallet from './CustomerWallet';
+const BASE_URL_MASTER_DATA = apiConfig.service_master_data;
+const URL_NATIONALITY = apiConfig.nationality;
+const BASE_URL_CUSTOMER = apiConfig.service_customer;
const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialData, handleReject, page, fetchCustomers,
handleClose, profession, dialogType
@@ -268,8 +266,8 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
- {(formData.id&&(!page||formData.destinationGroup === "Premium")) ? generateInput(formData, handleChange, 'Approval Premium Description', 'approval_description_premium', 'text', false, viewOnly): ''}
- {(formData.id&&(!page||formData.destinationGroup === "Agent")) ? generateInput(formData, handleChange, 'Approval Agent Description', 'approval_description_agent', 'text', false, viewOnly): ''}
+ {(formData.id&&(page==='kyc'&&formData.destinationGroup === "Premium")) ? generateInput(formData, handleChange, 'Approval Premium Description', 'approval_description_premium', 'text', false, viewOnly): ''}
+ {(formData.id&&(page==='kyc'&&formData.destinationGroup === "Agent")) ? generateInput(formData, handleChange, 'Approval Agent Description', 'approval_description_agent', 'text', false, viewOnly): ''}
{(formData.id && page!=='kyc') ? (