Create new production release

apps/api/package.json

@@ -2,7 +2,7 @@
   "author": "Pendulum Chain",
   "dependencies": {
     "@galacticcouncil/api-augment": "^0.8.1",
-    "@galacticcouncil/sdk": "^9.16.0",
+    "@galacticcouncil/sdk": "^10.6.2",
     "@paraspell/sdk-pjs": "^11.8.4",
     "@pendulum-chain/api-solang": "catalog:",
     "@polkadot/api": "catalog:",

apps/api/src/api/middlewares/validators.ts

@@ -377,6 +377,11 @@ export const validateSubaccountCreation: RequestHandler = (req, res, next) => {
 };
 
 export const validateCreateQuoteInput: RequestHandler<unknown, unknown, CreateQuoteRequest> = (req, res, next) => {
+  if (req.body) {
+    req.body.inputCurrency = normalizeAxlUsdcCurrency(req.body.inputCurrency) as CreateQuoteRequest["inputCurrency"];
+    req.body.outputCurrency = normalizeAxlUsdcCurrency(req.body.outputCurrency) as CreateQuoteRequest["outputCurrency"];
+  }
+
   const { rampType, from, to, inputAmount, inputCurrency, outputCurrency } = req.body;
 
   if (!rampType || !from || !to || !inputAmount || !inputCurrency || !outputCurrency) {
@@ -397,6 +402,11 @@ export const validateCreateBestQuoteInput: RequestHandler<unknown, unknown, Omit
   res,
   next
 ) => {
+  if (req.body) {
+    req.body.inputCurrency = normalizeAxlUsdcCurrency(req.body.inputCurrency) as CreateQuoteRequest["inputCurrency"];
+    req.body.outputCurrency = normalizeAxlUsdcCurrency(req.body.outputCurrency) as CreateQuoteRequest["outputCurrency"];
+  }
+
   const { rampType, from, to, inputAmount, inputCurrency, outputCurrency } = req.body;
 
   if (!rampType || !inputAmount || !inputCurrency || !outputCurrency) {
@@ -421,6 +431,12 @@ export const validateCreateBestQuoteInput: RequestHandler<unknown, unknown, Omit
   next();
 };
 
+const normalizeAxlUsdcCurrency = (value: unknown): unknown => {
+  if (typeof value !== "string") return value;
+
+  return value.toLowerCase() === "axlusdc" ? "USDC.axl" : value;
+};
+
 export const validateGetWidgetUrlInput: RequestHandler<unknown, unknown, GetWidgetUrlLocked | GetWidgetUrlRefresh> = (
   req,
   res,

apps/api/src/api/services/hydration/swap.ts

@@ -18,7 +18,9 @@ export class HydrationRouter {
     const apiManager = ApiManager.getInstance();
     this.cachedXcmFees = {};
     this.sdk = apiManager.getApi("hydration").then(async ({ api }) => {
-      return createSdkContext(api, { router: { includeOnly: [PoolType.Omni, PoolType.Stable] } });
+      return createSdkContext(api, {
+        router: { includeOnly: [PoolType.Omni, PoolType.Stable, PoolType.Aave] }
+      });
     });
 
     // Refresh transaction fees every hour

apps/api/src/database/migrations/022-update-subsidy-token-enum.ts

@@ -0,0 +1,58 @@
+import { QueryInterface } from "sequelize";
+
+const OLD_ENUM_VALUES = ["GLMR", "PEN", "XLM", "axlUSDC", "BRLA", "EURC"];
+const NEW_ENUM_VALUES = ["GLMR", "PEN", "XLM", "USDC.axl", "BRLA", "EURC", "USDC", "MATIC", "BRL"];
+
+export async function up(queryInterface: QueryInterface): Promise<void> {
+  // Phase 1: Convert enum to VARCHAR to allow value updates
+  await queryInterface.sequelize.query(`
+    ALTER TABLE subsidies ALTER COLUMN token TYPE VARCHAR(32);
+  `);
+
+  // Phase 2: Rename axlUSDC to USDC.axl
+  await queryInterface.sequelize.query(`
+    UPDATE subsidies SET token = 'USDC.axl' WHERE token = 'axlUSDC';
+  `);
+
+  // Phase 3: Replace enum type with updated values
+  await queryInterface.sequelize.query(`
+    DROP TYPE IF EXISTS enum_subsidies_token;
+  `);
+
+  await queryInterface.sequelize.query(`
+    CREATE TYPE enum_subsidies_token AS ENUM (${NEW_ENUM_VALUES.map(value => `'${value}'`).join(", ")});
+  `);
+
+  await queryInterface.sequelize.query(`
+    ALTER TABLE subsidies ALTER COLUMN token TYPE enum_subsidies_token USING token::enum_subsidies_token;
+  `);
+}
+
+export async function down(queryInterface: QueryInterface): Promise<void> {
+  // Phase 1: Convert enum to VARCHAR to allow value updates
+  await queryInterface.sequelize.query(`
+    ALTER TABLE subsidies ALTER COLUMN token TYPE VARCHAR(32);
+  `);
+
+  // Phase 2: Map unsupported values back to axlUSDC for the old enum
+  await queryInterface.sequelize.query(`
+    UPDATE subsidies SET token = 'axlUSDC' WHERE token = 'USDC.axl';
+  `);
+
+  await queryInterface.sequelize.query(`
+    UPDATE subsidies SET token = 'axlUSDC' WHERE token IN ('USDC', 'MATIC', 'BRL');
+  `);
+
+  // Phase 3: Restore old enum type
+  await queryInterface.sequelize.query(`
+    DROP TYPE IF EXISTS enum_subsidies_token;
+  `);
+
+  await queryInterface.sequelize.query(`
+    CREATE TYPE enum_subsidies_token AS ENUM (${OLD_ENUM_VALUES.map(value => `'${value}'`).join(", ")});
+  `);
+
+  await queryInterface.sequelize.query(`
+    ALTER TABLE subsidies ALTER COLUMN token TYPE enum_subsidies_token USING token::enum_subsidies_token;
+  `);
+}

apps/frontend/src/components/CurrencyExchange/index.tsx

@@ -33,15 +33,16 @@ export const CurrencyExchange = ({
   outputNetwork,
   inputIcon: inputIconProp,
   outputIcon: outputIconProp,
-  inputFallbackIcon,
-  outputFallbackIcon
+  inputFallbackIcon: inputFallbackIconProp,
+  outputFallbackIcon: outputFallbackIconProp
 }: CurrencyExchangeProps) => {
-  // Use useTokenIcon for fallback icons when explicit icon props aren't provided
   const inputIconFallback = useTokenIcon(inputCurrency, inputNetwork);
   const outputIconFallback = useTokenIcon(outputCurrency, outputNetwork);
 
   const inputIcon = inputIconProp ?? inputIconFallback.iconSrc;
   const outputIcon = outputIconProp ?? outputIconFallback.iconSrc;
+  const inputFallbackIcon = inputFallbackIconProp ?? inputIconFallback.fallbackIconSrc;
+  const outputFallbackIcon = outputFallbackIconProp ?? outputIconFallback.fallbackIconSrc;
 
   if (layout === "vertical") {
     return (

apps/frontend/src/components/Ramp/Offramp/index.tsx

@@ -81,7 +81,7 @@ export const Offramp = () => {
     () => (
       <>
         <AssetNumericInput
-          assetIcon={fromToken.networkAssetIcon}
+          assetIcon={fromToken.assetSymbol}
           fallbackLogoURI={fromIconInfo.fallbackIconSrc}
           id="inputAmount"
           logoURI={fromIconInfo.iconSrc}

apps/frontend/src/components/Ramp/Onramp/index.tsx

@@ -89,7 +89,7 @@ export const Onramp = () => {
   const ReceiveNumericInput = useMemo(
     () => (
       <AssetNumericInput
-        assetIcon={toToken.networkAssetIcon}
+        assetIcon={toToken.assetSymbol}
         disabled={!toAmount}
         fallbackLogoURI={toIconInfo.fallbackIconSrc}
         id="outputAmount"
@@ -102,7 +102,7 @@ export const Onramp = () => {
         tokenSymbol={toToken.assetSymbol}
       />
     ),
-    [toToken.networkAssetIcon, toToken.assetSymbol, form, quoteLoading, toAmount, openTokenSelectModal, toIconInfo]
+    [toToken.assetSymbol, form, quoteLoading, toAmount, openTokenSelectModal, toIconInfo]
   );
 
   const handleConfirm = useCallback(() => {

apps/frontend/src/components/TokenIcon/index.tsx

@@ -14,20 +14,14 @@ export const TokenIcon: FC<TokenIconProps> = memo(function TokenIcon({ src, fall
   const [imgError, setImgError] = useState(false);
   const [fallbackError, setFallbackError] = useState(false);
 
-  const getImageSrc = () => {
-    if (!imgError) return src;
-    if (fallbackSrc && !fallbackError) return fallbackSrc;
-    return placeholderIcon;
-  };
-
   const handleError = () => {
     if (!imgError) {
       setImgError(true);
-      setIsLoading(true);
-    } else if (fallbackSrc && !fallbackError) {
-      setFallbackError(true);
-      setIsLoading(true);
+      if (!fallbackSrc) {
+        setIsLoading(false);
+      }
     } else {
+      setFallbackError(true);
       setIsLoading(false);
     }
   };
@@ -36,6 +30,12 @@ export const TokenIcon: FC<TokenIconProps> = memo(function TokenIcon({ src, fall
     setIsLoading(false);
   };
 
+  const getImageSrc = () => {
+    if (!imgError) return src;
+    if (fallbackSrc && !fallbackError) return fallbackSrc;
+    return placeholderIcon;
+  };
+
   return (
     <div className={cn("relative", className)}>
       {isLoading && <div className="absolute inset-0 rounded-full bg-gray-200" />}

apps/frontend/src/components/TokenSelection/TokenSelectionList/components/SelectionTokenList.tsx

@@ -1,4 +1,5 @@
 import { useVirtualizer } from "@tanstack/react-virtual";
+import { isNetworkEVM } from "@vortexfi/shared";
 import { useMemo, useRef } from "react";
 import { useNetwork } from "../../../../contexts/network";
 import { cn } from "../../../../helpers/cn";
@@ -16,7 +17,20 @@ function getBalanceKey(network: string, symbol: string): string {
   return `${network}-${symbol}`;
 }
 
-function sortByBalance(
+/**
+ * Sorts the given token definitions for optimal UX in the token selection list.
+ *
+ * Sort priority:
+ *   1. Tokens with higher USD balance come first.
+ *   2. For equal USD value, tokens with higher raw balance come first.
+ *   3. Tokens from "static config" (see isFromStaticConfig) or non-EVM networks come before dynamic/discovered tokens.
+ *   4. Fallback to asset symbol alphabetical sort.
+ *
+ * @param definitions - Array of tokens to display in the modal.
+ * @param balances - Map keyed by 'network-symbol', containing balance and balanceUsd for each token.
+ * @returns Sorted array of ExtendedTokenDefinition.
+ */
+function sortTokens(
   definitions: ExtendedTokenDefinition[],
   balances: Map<string, { balance: string; balanceUsd: string }>
 ): ExtendedTokenDefinition[] {
@@ -30,14 +44,19 @@ function sortByBalance(
       return usdB - usdA;
     }
 
-    // When USD values are equal (e.g., both 0), sort by raw balance
     const rawBalanceA = parseFloat(balanceA?.balance ?? "0");
     const rawBalanceB = parseFloat(balanceB?.balance ?? "0");
 
     if (rawBalanceA !== rawBalanceB) {
       return rawBalanceB - rawBalanceA;
     }
 
+    const isStaticA = !isNetworkEVM(a.network) || (a.details as { isFromStaticConfig?: boolean }).isFromStaticConfig;
+    const isStaticB = !isNetworkEVM(b.network) || (b.details as { isFromStaticConfig?: boolean }).isFromStaticConfig;
+    if (isStaticA !== isStaticB) {
+      return isStaticA ? -1 : 1;
+    }
+
     return a.assetSymbol.localeCompare(b.assetSymbol);
   });
 }
@@ -54,7 +73,7 @@ export const SelectionTokenList = () => {
   const balances = useTokenBalances();
 
   const currentDefinitions = useMemo(
-    () => (isFiatDirection ? filteredDefinitions : sortByBalance(filteredDefinitions, balances)),
+    () => (isFiatDirection ? filteredDefinitions : sortTokens(filteredDefinitions, balances)),
     [isFiatDirection, filteredDefinitions, balances]
   );
 

apps/frontend/src/components/TokenSelection/TokenSelectionList/helpers.tsx

@@ -6,6 +6,7 @@ import {
   FiatTokenDetails,
   getEnumKeyByStringValue,
   getNetworkDisplayName,
+  isEvmTokenDetails,
   isNetworkEVM,
   moonbeamTokenConfig,
   Networks,
@@ -63,7 +64,7 @@ export function useTokenDefinitions(filter: string, selectedNetworkFilter: Netwo
 function getOnChainTokensDefinitionsForNetwork(selectedNetwork: Networks): ExtendedTokenDefinition[] {
   if (selectedNetwork === Networks.AssetHub) {
     return Object.entries(assetHubTokenConfig).map(([key, value]) => ({
-      assetIcon: value.networkAssetIcon,
+      assetIcon: value.assetSymbol,
       assetSymbol: value.assetSymbol,
       details: value as OnChainTokenDetails,
       logoURI: value.logoURI,
@@ -74,12 +75,30 @@ function getOnChainTokensDefinitionsForNetwork(selectedNetwork: Networks): Exten
   } else if (isNetworkEVM(selectedNetwork)) {
     const evmConfig = getEvmTokenConfig();
     const networkConfig = evmConfig[selectedNetwork as EvmNetworks] ?? {};
-    return Object.entries(networkConfig).map(([key, value]) => ({
-      assetIcon: value?.logoURI ?? value?.networkAssetIcon ?? "",
-      assetSymbol: value?.assetSymbol ?? key,
-      details: value as OnChainTokenDetails,
-      fallbackLogoURI: value?.fallbackLogoURI,
-      logoURI: value?.logoURI,
+    const byToken = new Map<OnChainTokenDetails, string>();
+
+    for (const [key, value] of Object.entries(networkConfig)) {
+      if (!value) continue;
+      const token = value as OnChainTokenDetails;
+      const existingKey = byToken.get(token);
+
+      if (!existingKey) {
+        byToken.set(token, key);
+        continue;
+      }
+
+      // Prefer enum-like keys without dots (e.g., "AXLUSDC" over "USDC.AXL")
+      if (existingKey.includes(".") && !key.includes(".")) {
+        byToken.set(token, key);
+      }
+    }
+
+    return Array.from(byToken.entries()).map(([details, key]) => ({
+      assetIcon: details.assetSymbol ?? key,
+      assetSymbol: details.assetSymbol ?? key,
+      details,
+      fallbackLogoURI: isEvmTokenDetails(details) ? details.fallbackLogoURI : undefined,
+      logoURI: details.logoURI,
       network: selectedNetwork,
       networkDisplayName: getNetworkDisplayName(selectedNetwork),
       type: key as OnChainToken

apps/frontend/src/components/buttons/AssetButton/index.tsx

@@ -38,7 +38,7 @@ export function AssetButton({
     >
       <TokenIconWithNetwork
         className="mr-1 h-5 w-5"
-        fallbackIconSrc={fallbackLogoURI}
+        fallbackIconSrc={fallbackLogoURI ?? fallbackIcon.fallbackIconSrc}
         iconSrc={primaryIcon}
         network={network}
         showNetworkOverlay={!!network}

apps/frontend/src/hooks/useTokenIcon.ts

@@ -22,19 +22,14 @@ export interface TokenIconInfo {
 
 /**
  * Get logo URIs from on-chain token details.
- * Supports both EVM tokens (with fallback) and AssetHub tokens.
+ * Supports both EVM tokens (with fallbackLogoURI) and AssetHub tokens.
  */
 function getTokenLogoURIs(token: OnChainTokenDetails): { logoURI?: string; fallbackLogoURI?: string } {
   if (isEvmTokenDetails(token)) {
-    return {
-      fallbackLogoURI: token.fallbackLogoURI,
-      logoURI: token.logoURI
-    };
+    return { fallbackLogoURI: token.fallbackLogoURI, logoURI: token.logoURI };
   }
   if (isAssetHubTokenDetails(token)) {
-    return {
-      logoURI: token.logoURI
-    };
+    return { logoURI: token.logoURI };
   }
   return {};
 }

packages/shared/src/services/squidrouter/config.ts

@@ -1,4 +1,5 @@
-import { AXL_USDC_MOONBEAM, getNetworkId, Networks } from "../../index";
+import { getNetworkId, Networks } from "../../helpers/networks";
+import { AXL_USDC_MOONBEAM } from "../../tokens/moonbeam/config";
 
 export const SQUIDROUTER_FEE_OVERPAY = 0.25; // 25% overpayment
 export const MOONBEAM_SQUIDROUTER_SWAP_MIN_VALUE_RAW = "10000000000000000"; // 0.01 GLMR in raw units