From bb30e14dfefb99071fdae0e1ccdd0bc31627e84f Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 28 Aug 2026 16:07:05 +0200 Subject: [PATCH] After trying to recuparate money from cold wallet5 --- backend/src/services/fundApprovalService.ts | 21 +++++++--- backend/src/validation/adminSchemas.ts | 22 +++++++--- .../features/treasury/TreasuryAdminPage.tsx | 41 +++++++++++++------ prediqo_web/src/shared/i18n/locales/en.ts | 1 + prediqo_web/src/shared/i18n/locales/fr.ts | 1 + 5 files changed, 63 insertions(+), 23 deletions(-) diff --git a/backend/src/services/fundApprovalService.ts b/backend/src/services/fundApprovalService.ts index 44a85b6a..d73e27b0 100644 --- a/backend/src/services/fundApprovalService.ts +++ b/backend/src/services/fundApprovalService.ts @@ -68,11 +68,22 @@ export async function createFundRequest(input: { ); if (!canRequest) throw new FundApprovalError('Permission denied: fund_operation.request'); - const row = await fundOperationRequestRepository.createRequest({ - operationType: input.operationType, - payload: input.payload, - requestedBy: input.requestedBy, - }); + let row; + try { + row = await fundOperationRequestRepository.createRequest({ + operationType: input.operationType, + payload: input.payload, + requestedBy: input.requestedBy, + }); + } catch (e) { + const msg = e instanceof Error ? e.message : ''; + if (/operation_type_check|violates check constraint/i.test(msg)) { + throw new FundApprovalError( + 'Database schema is missing this operation type. Run db migrations and restart the backend.' + ); + } + throw e; + } await auditLogRepository.create({ userId: input.requestedBy, diff --git a/backend/src/validation/adminSchemas.ts b/backend/src/validation/adminSchemas.ts index fe15eefb..045cebe7 100644 --- a/backend/src/validation/adminSchemas.ts +++ b/backend/src/validation/adminSchemas.ts @@ -232,12 +232,22 @@ export const treasuryFundingConfirmBodySchema = z.object({ blockchainTxId: z.string().trim().min(1).max(255), }); -export const treasuryGasTransferBodySchema = z.object({ - walletTypeId: z.number().int().positive(), - direction: z.enum(['hot_to_cold', 'cold_to_hot']), - amount: z.string().regex(/^\d+$/), - notes: z.string().trim().max(2000).optional(), -}); +export const treasuryGasTransferBodySchema = z + .object({ + walletTypeId: z.coerce.number().int().positive(), + direction: z.enum(['hot_to_cold', 'cold_to_hot']), + amount: z.union([z.string(), z.number()]).transform((v) => String(v).trim()), + notes: z.string().trim().max(2000).optional(), + }) + .superRefine((val, ctx) => { + if (!/^\d+$/.test(val.amount) || val.amount === '0') { + ctx.addIssue({ + code: 'custom', + message: 'amount must be a positive integer string', + path: ['amount'], + }); + } + }); export const countryRegistrationBodySchema = z.object({ registrationAllowed: z.boolean(), diff --git a/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx b/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx index 84b32059..13bb2068 100644 --- a/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx +++ b/prediqo_web/src/features/treasury/TreasuryAdminPage.tsx @@ -48,6 +48,7 @@ import { PageHeader, RefreshIconButton } from '../../shared/components/PageHeade import { PermissionGate } from '../../shared/auth/PermissionGate'; import { ScrollableTable } from '../../shared/components/ScrollableTable'; import { copyTextToClipboard } from '../../shared/utils/clipboard'; +import { apiErrorMessage } from '../../shared/utils/apiError'; import { rawToHuman } from '../wallet/utils/walletFormat'; type WalletType = { @@ -279,6 +280,7 @@ export function TreasuryAdminPage() { } | null>(null); const [pendingMsg, setPendingMsg] = useState(null); const [fundingError, setFundingError] = useState(null); + const [gasError, setGasError] = useState(null); const [copyToast, setCopyToast] = useState(null); const notifyCopy = (ok: boolean) => { @@ -405,7 +407,10 @@ export function TreasuryAdminPage() { void qc.invalidateQueries({ queryKey: ['admin-treasury-overview'] }); void qc.invalidateQueries({ queryKey: ['admin-treasury-gas-preview'] }); setGasForm((f) => ({ ...f, amount: '', notes: '' })); - setFundingError(null); + setGasError(null); + }, + onError: (err) => { + setGasError(apiErrorMessage(err, t('admin.treasury.gasRequestFailed'))); }, }); @@ -445,29 +450,33 @@ export function TreasuryAdminPage() { }; const submitGasTransfer = () => { - setFundingError(null); + setGasError(null); if (!gasForm.walletTypeId) { - setFundingError(t('admin.treasury.fundingSelectNetwork')); + setGasError(t('admin.treasury.fundingSelectNetwork')); return; } if (!gasPreview) { - setFundingError(t('admin.treasury.gasPreviewError')); + setGasError(t('admin.treasury.gasPreviewError')); return; } - const raw = humanAmountToRaw(gasForm.amount, gasPreview.decimals); + let raw = humanAmountToRaw(gasForm.amount, gasPreview.decimals); if (raw === '0') { - setFundingError(t('admin.treasury.invalidGasAmount')); + setGasError(t('admin.treasury.invalidGasAmount')); return; } - if (gasForm.direction === 'hot_to_cold' && BigInt(raw) > BigInt(gasPreview.maxSendable)) { - setFundingError(t('admin.treasury.gasExceedsReserve')); - return; + if (gasForm.direction === 'hot_to_cold') { + const max = BigInt(gasPreview.maxSendable); + if (max <= 0n) { + setGasError(t('admin.treasury.gasExceedsReserve')); + return; + } + if (BigInt(raw) > max) raw = max.toString(); } - void requestGasMut.mutateAsync({ + requestGasMut.mutate({ walletTypeId: gasForm.walletTypeId, direction: gasForm.direction, amount: raw, - notes: gasForm.notes || undefined, + notes: gasForm.notes.trim() || undefined, }); }; @@ -833,6 +842,7 @@ export function TreasuryAdminPage() { )} + {gasError && ( + setGasError(null)}> + {gasError} + + )}