pezkuwichain/pwap
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pwap.git synced 2026-06-13 12:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct token symbol parsing in swap history

Browse Source 
- Fixed path array parsing for SwapExecuted events
- Handle different Polkadot.js enum formats (nativeOrAsset vs NativeOrAsset)
- Added toJSON() conversion for proper array parsing
- Now correctly shows HEZ↔PEZ swaps instead of HEZ→HEZ
- Applied fix to both initial history load and post-swap refresh

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Kurdistan Tech Ministry
2025-11-01 15:27:57 +03:00
parent 47be31e04e
commit a403a15695
1 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/TokenSwap.tsx
+47 -5
View File
@@ -370,9 +370,32 @@ const TokenSwap = () => {
if (api.events.assetConversion?.SwapExecuted?.is(event)) { if (api.events.assetConversion?.SwapExecuted?.is(event)) {
const [who, path, amountIn, amountOut] = event.data; const [who, path, amountIn, amountOut] = event.data;
// Parse path to get token symbols // Parse path to get token symbols - path is Vec<MultiAsset>
const fromAssetId = path[0]?.nativeOrAsset?.asset?.toNumber() || 0; let fromAssetId = 0;
const toAssetId = path[1]?.nativeOrAsset?.asset?.toNumber() || 0; let toAssetId = 0;
try {
// Try different path formats
const pathArray = path.toJSON ? path.toJSON() : path;
if (Array.isArray(pathArray) && pathArray.length >= 2) {
// Extract asset IDs from path
const asset0 = pathArray[0];
const asset1 = pathArray[1];
// Handle different enum formats
if (typeof asset0 === 'object') {
fromAssetId = asset0.nativeOrAsset?.asset || asset0.NativeOrAsset?.Asset || 0;
}
if (typeof asset1 === 'object') {
toAssetId = asset1.nativeOrAsset?.asset || asset1.NativeOrAsset?.Asset || 0;
}
}
console.log('🔍 Parsed swap path:', { pathArray, fromAssetId, toAssetId });
} catch (err) {
console.warn('Failed to parse path:', err);
}
const fromTokenSymbol = fromAssetId === 0 ? 'wHEZ' : fromAssetId === 1 ? 'PEZ' : `Asset${fromAssetId}`; const fromTokenSymbol = fromAssetId === 0 ? 'wHEZ' : fromAssetId === 1 ? 'PEZ' : `Asset${fromAssetId}`;
const toTokenSymbol = toAssetId === 0 ? 'wHEZ' : toAssetId === 1 ? 'PEZ' : `Asset${toAssetId}`; const toTokenSymbol = toAssetId === 0 ? 'wHEZ' : toAssetId === 1 ? 'PEZ' : `Asset${toAssetId}`;
@@ -591,10 +614,29 @@ const TokenSwap = () => {
const { event } = record; const { event } = record;
if (api.events.assetConversion?.SwapExecuted?.is(event)) { if (api.events.assetConversion?.SwapExecuted?.is(event)) {
const [who, path, amountIn, amountOut] = event.data; const [who, path, amountIn, amountOut] = event.data;
const fromAssetId = path[0]?.nativeOrAsset?.asset?.toNumber() || 0;
const toAssetId = path[1]?.nativeOrAsset?.asset?.toNumber() || 0; // Parse path (same logic as main history fetch)
let fromAssetId = 0;
let toAssetId = 0;
try {
const pathArray = path.toJSON ? path.toJSON() : path;
if (Array.isArray(pathArray) && pathArray.length >= 2) {
const asset0 = pathArray[0];
const asset1 = pathArray[1];
if (typeof asset0 === 'object') {
fromAssetId = asset0.nativeOrAsset?.asset || asset0.NativeOrAsset?.Asset || 0;
}
if (typeof asset1 === 'object') {
toAssetId = asset1.nativeOrAsset?.asset || asset1.NativeOrAsset?.Asset || 0;
}
}
} catch (err) {
console.warn('Failed to parse path in refresh:', err);
}
const fromTokenSymbol = fromAssetId === 0 ? 'wHEZ' : fromAssetId === 1 ? 'PEZ' : `Asset${fromAssetId}`; const fromTokenSymbol = fromAssetId === 0 ? 'wHEZ' : fromAssetId === 1 ? 'PEZ' : `Asset${fromAssetId}`;
const toTokenSymbol = toAssetId === 0 ? 'wHEZ' : toAssetId === 1 ? 'PEZ' : `Asset${toAssetId}`; const toTokenSymbol = toAssetId === 0 ? 'wHEZ' : toAssetId === 1 ? 'PEZ' : `Asset${toAssetId}`;
if (who.toString() === selectedAccount.address) { if (who.toString() === selectedAccount.address) {
transactions.push({ transactions.push({
blockNumber: blockNum, blockNumber: blockNum,