From 3eb39c2e4a7458b03d910e3c58acdb5fa0ae8ea6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 26 Aug 2026 15:32:07 +0200 Subject: [PATCH] After confirming the succes withdrawal1 --- backend/src/services/shareCardService.ts | 60 +++++++++++++++---- .../lib/data/models/share_card_models.dart | 3 + .../presentation/share_result_widgets.dart | 22 +++++++ .../features/share-cards/ShareResultCard.tsx | 29 +++++++++ prediqo_web/src/shared/i18n/locales/en.ts | 2 + prediqo_web/src/shared/i18n/locales/fr.ts | 2 + 6 files changed, 107 insertions(+), 11 deletions(-) diff --git a/backend/src/services/shareCardService.ts b/backend/src/services/shareCardService.ts index c96aa87f..efd2426a 100644 --- a/backend/src/services/shareCardService.ts +++ b/backend/src/services/shareCardService.ts @@ -286,29 +286,67 @@ function shortAssetSymbol(code: string): string { return base.toUpperCase(); } +/** Human network label for share cards (prefer rail metadata over ledger type). */ +function shareNetworkLabel(network: string | null, assetCode: string): string | null { + if (!network && !assetCode) return null; + const code = assetCode.toUpperCase(); + const net = (network || '').toUpperCase(); + if (code.includes('BEP20') || net === 'BSC') return 'BSC (BEP20)'; + if (code.includes('TRC20') || net === 'TRON') return 'TRON (TRC20)'; + return network; +} + async function buildWalletOpCardPayload( tx: Transaction, opts: { includeReferral: boolean; referralCode: string | null } ) { - const wt = await walletRepository.getWalletTypeById(tx.wallet_type_id); - const decimals = wt?.decimals ?? STAKE_DECIMALS; + const ledgerWt = await walletRepository.getWalletTypeById(tx.wallet_type_id); + const meta = (tx.metadata ?? {}) as Record; + const railCode = + typeof meta.rail_wallet_type === 'string' + ? meta.rail_wallet_type + : typeof meta.source_wallet_type === 'string' + ? meta.source_wallet_type + : null; + + // Withdrawals/deposits credit a unified ledger (often USDT_TRC20) but custody/payout + // rail is stored in metadata — prefer that for share-card asset/network labels. + let displayWt = ledgerWt; + if (railCode) { + const rail = await walletRepository.getWalletTypeByCode(railCode); + if (rail) displayWt = rail; + } + + const decimals = ledgerWt?.decimals ?? STAKE_DECIMALS; const amountRaw = BigInt(tx.amount); + const feeRaw = BigInt(tx.fee || '0'); const amountDisplay = rawToDisplay(amountRaw, decimals); - const assetCode = wt?.code ?? 'USDT'; + const assetCode = displayWt?.code ?? ledgerWt?.code ?? 'USDT'; const assetSymbol = shortAssetSymbol(assetCode); - const network = wt?.network ?? null; + const network = shareNetworkLabel( + (typeof meta.network === 'string' && meta.network.trim() + ? meta.network.trim() + : null) ?? + displayWt?.network ?? + null, + assetCode + ); const token = createShareVerifyToken('tx', tx.id, tx.user_id); const verifyUrl = buildShareVerifyUrl(token); const registerUrl = opts.referralCode ? buildReferralRegisterLink(opts.referralCode) : `${getPublicWebBaseUrl()}/register`; - const signedDisplay = - tx.type === 'withdrawal' - ? `-${amountDisplay}` - : tx.type === 'transfer' - ? amountDisplay - : `+${amountDisplay}`; + let signedDisplay: string; + if (tx.type === 'withdrawal') { + const totalDisplay = + feeRaw > 0n ? rawToDisplay(amountRaw + feeRaw, decimals) : amountDisplay; + signedDisplay = `-${totalDisplay}`; + } else if (tx.type === 'transfer') { + signedDisplay = amountDisplay; + } else { + signedDisplay = `+${amountDisplay}`; + } return { kind: 'wallet' as const, @@ -321,7 +359,7 @@ async function buildWalletOpCardPayload( feeRaw: tx.fee, assetCode, assetSymbol, - assetName: wt?.name ?? assetCode, + assetName: displayWt?.name ?? assetCode, network, createdAt: tx.created_at.toISOString(), blockchainTxId: tx.blockchain_tx_id, diff --git a/prediqo_mobile/lib/data/models/share_card_models.dart b/prediqo_mobile/lib/data/models/share_card_models.dart index ff87c63b..854d3141 100644 --- a/prediqo_mobile/lib/data/models/share_card_models.dart +++ b/prediqo_mobile/lib/data/models/share_card_models.dart @@ -124,6 +124,7 @@ class ShareCardPayload { this.operationType, this.amountSignedDisplay, this.amountDisplay, + this.feeRaw, this.assetSymbol, this.assetName, this.network, @@ -153,6 +154,7 @@ class ShareCardPayload { final String? operationType; final String? amountSignedDisplay; final String? amountDisplay; + final String? feeRaw; final String? assetSymbol; final String? assetName; final String? network; @@ -187,6 +189,7 @@ class ShareCardPayload { operationType: json['operationType']?.toString(), amountSignedDisplay: json['amountSignedDisplay']?.toString(), amountDisplay: json['amountDisplay']?.toString(), + feeRaw: json['feeRaw']?.toString(), assetSymbol: json['assetSymbol']?.toString(), assetName: json['assetName']?.toString(), network: json['network']?.toString(), diff --git a/prediqo_mobile/lib/features/share_cards/presentation/share_result_widgets.dart b/prediqo_mobile/lib/features/share_cards/presentation/share_result_widgets.dart index f3fbb7fb..3cd0a9a4 100644 --- a/prediqo_mobile/lib/features/share_cards/presentation/share_result_widgets.dart +++ b/prediqo_mobile/lib/features/share_cards/presentation/share_result_widgets.dart @@ -292,6 +292,18 @@ class _WalletCard extends StatelessWidget { _KV(s.t('Asset', 'Actif'), payload.assetName ?? payload.assetSymbol ?? ''), if ((payload.network ?? '').isNotEmpty) _KV(s.t('Network', 'Réseau'), payload.network!), + if (payload.operationType == 'withdrawal' && + (payload.feeRaw ?? '0') != '0' && + (payload.feeRaw ?? '').isNotEmpty) ...[ + _KV( + s.t('Withdrawn', 'Retiré'), + '${payload.amountDisplay ?? ''} ${payload.assetSymbol ?? ''}'.trim(), + ), + _KV( + s.t('Fee', 'Frais'), + '${_formatMicroUsdt(payload.feeRaw!)} ${payload.assetSymbol ?? ''}'.trim(), + ), + ], if (created != null) _KV(s.t('Date', 'Date'), _fmt(created)), ], verifyUrl: payload.verifyUrl, @@ -299,6 +311,16 @@ class _WalletCard extends StatelessWidget { } } +String _formatMicroUsdt(String raw, {int decimals = 6}) { + final n = BigInt.tryParse(raw.trim()) ?? BigInt.zero; + final base = BigInt.from(10).pow(decimals); + final whole = n ~/ base; + final frac = n % base; + if (frac == BigInt.zero) return whole.toString(); + final fracStr = frac.toString().padLeft(decimals, '0').replaceAll(RegExp(r'0+$'), ''); + return '$whole.$fracStr'; +} + class _CardShell extends StatelessWidget { const _CardShell({ required this.title, diff --git a/prediqo_web/src/features/share-cards/ShareResultCard.tsx b/prediqo_web/src/features/share-cards/ShareResultCard.tsx index 233ec619..229f40be 100644 --- a/prediqo_web/src/features/share-cards/ShareResultCard.tsx +++ b/prediqo_web/src/features/share-cards/ShareResultCard.tsx @@ -96,6 +96,19 @@ function PredictionCard({ ); } +function formatMicroUsdt(raw: string, decimals = 6): string { + try { + const n = BigInt(raw); + const base = 10n ** BigInt(decimals); + const whole = n / base; + const frac = n % base; + if (frac === 0n) return whole.toString(); + return `${whole.toString()}.${frac.toString().padStart(decimals, '0').replace(/0+$/, '')}`; + } catch { + return raw; + } +} + function WalletOpCard({ payload, cardRef, @@ -136,6 +149,22 @@ function WalletOpCard({ /> {payload.network ? : null} + {payload.operationType === 'withdrawal' && + payload.feeRaw && + payload.feeRaw !== '0' ? ( + + ) : null} + {payload.operationType === 'withdrawal' && + payload.feeRaw && + payload.feeRaw !== '0' ? ( + + ) : null}