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/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
index 4b5d549..eb72ba9 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
(null);
+ const [currentBalanceTransfer, setCurrentBalanceTransfer] = useState(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 (