@pear-protocol/hyperliquid-sdk 0.0.78 → 0.1.0

package/dist/index.js

@@ -105,84 +105,9 @@ const useMarketData = create((set) => ({
     marketData: null,
     marketDataAll: null,
     setMarketData: (value) => set({ marketData: value }),
-    setMarketDataAll: (value) => set({ marketDataAll: value }),
-    clean: () => set({ marketData: null, marketDataAll: null }),
+    clean: () => set({ marketData: null }),
 }));
 
-// Utilities for translating between display symbols and backend (prefixed) symbols
-/**
- * Convert a full/prefixed symbol (e.g., "xyz:XYZ100") to a display symbol (e.g., "XYZ100").
- */
-function toDisplaySymbol(symbol) {
-    const parts = symbol.split(":");
-    return parts.length > 1 ? parts.slice(-1)[0] : symbol;
-}
-/**
- * Convert a display symbol back to backend form using a provided map.
- * If mapping is missing, returns the original symbol.
- * For multi-market assets, returns the first available market.
- * @param displaySymbol e.g., "TSLA"
- * @param hip3Assets map of display -> all full market names (e.g., "TSLA" -> ["xyz:TSLA", "flx:TSLA"])
- */
-function toBackendSymbol(displaySymbol, hip3Assets) {
-    if (displaySymbol === "BTC")
-        return "BTC";
-    const markets = hip3Assets.get(displaySymbol);
-    // Return first market if available, otherwise return original symbol
-    return markets && markets.length > 0 ? markets[0] : displaySymbol;
-}
-/**
- * Convert a display symbol to backend form for a specific market prefix.
- * This is useful when an asset is available on multiple markets (e.g., xyz:TSLA and flx:TSLA).
- * @param displaySymbol e.g., "TSLA"
- * @param marketPrefix e.g., "xyz" or "flx"
- * @param hip3Assets map of display -> all full market names
- * @returns Full market name if found, null if prefix not specified for multi-market asset, otherwise displaySymbol with prefix
- */
-function toBackendSymbolWithMarket(displaySymbol, marketPrefix, hip3Assets) {
-    const availableMarkets = hip3Assets.get(displaySymbol);
-    if (!availableMarkets || availableMarkets.length === 0) {
-        // Not a HIP-3 asset, return as-is or with prefix if provided
-        return marketPrefix ? `${marketPrefix}:${displaySymbol}` : displaySymbol;
-    }
-    if (marketPrefix) {
-        // Find the market with the specified prefix
-        const targetMarket = availableMarkets.find((market) => market.toLowerCase().startsWith(`${marketPrefix.toLowerCase()}:`));
-        if (targetMarket) {
-            return targetMarket;
-        }
-    }
-    // No prefix specified or not found, return null to force explicit market selection
-    return null;
-}
-/**
- * Get all available markets for a display symbol.
- * @param displaySymbol e.g., "TSLA"
- * @param hip3Assets map of display -> all full market names
- * @returns Array of full market names, e.g., ["xyz:TSLA", "flx:TSLA"]
- */
-function getAvailableMarkets(displaySymbol, hip3Assets) {
-    var _a;
-    return (_a = hip3Assets.get(displaySymbol)) !== null && _a !== void 0 ? _a : [];
-}
-/**
- * Extract the market prefix from a full market name.
- * @param fullSymbol e.g., "xyz:TSLA"
- * @returns The prefix (e.g., "xyz") or undefined if no prefix
- */
-function getMarketPrefix(fullSymbol) {
-    const parts = fullSymbol.split(":");
-    return parts.length > 1 ? parts[0] : undefined;
-}
-/**
- * Check if a symbol is a HIP-3 market (has a prefix).
- * @param symbol e.g., "xyz:TSLA" or "TSLA"
- * @returns true if the symbol has a market prefix
- */
-function isHip3Market(symbol) {
-    return symbol.includes(":");
-}
-
 const useHyperliquidWebSocket = ({ wsUrl, address, enabled = true, }) => {
     const { setTradeHistories, setRawOpenPositions, setOpenOrders, setAccountSummary, setTwapDetails, setNotifications, clean, } = useUserData();
     const { setMarketData } = useMarketData();
@@ -217,60 +142,19 @@ const useHyperliquidWebSocket = ({ wsUrl, address, enabled = true, }) => {
                 switch (dataMessage.channel) {
                     case 'trade-histories':
                         {
-                            const mapAsset = (a) => {
-                                var _a, _b;
-                                const extractedPrefix = getMarketPrefix(a.coin);
-                                return {
-                                    ...a,
-                                    coin: toDisplaySymbol(a.coin),
-                                    marketPrefix: (_b = (_a = a.marketPrefix) !== null && _a !== void 0 ? _a : extractedPrefix) !== null && _b !== void 0 ? _b : null,
-                                };
-                            };
-                            const list = dataMessage.data.map((item) => {
-                                var _a, _b;
-                                return ({
-                                    ...item,
-                                    closedLongAssets: item.closedLongAssets.map(mapAsset),
-                                    closedShortAssets: item.closedShortAssets.map(mapAsset),
-                                    positionLongAssets: (_a = item.positionLongAssets) === null || _a === void 0 ? void 0 : _a.map((a) => toDisplaySymbol(a)),
-                                    positionShortAssets: (_b = item.positionShortAssets) === null || _b === void 0 ? void 0 : _b.map((a) => toDisplaySymbol(a)),
-                                });
-                            });
+                            const list = dataMessage.data;
                             setTradeHistories(list);
                         }
                         break;
                     case 'open-positions':
                         {
-                            const enrichAsset = (a) => {
-                                var _a, _b;
-                                const extractedPrefix = getMarketPrefix(a.coin);
-                                return {
-                                    ...a,
-                                    coin: toDisplaySymbol(a.coin),
-                                    marketPrefix: (_b = (_a = a.marketPrefix) !== null && _a !== void 0 ? _a : extractedPrefix) !== null && _b !== void 0 ? _b : null,
-                                };
-                            };
-                            const list = dataMessage.data.map((pos) => ({
-                                ...pos,
-                                longAssets: pos.longAssets.map(enrichAsset),
-                                shortAssets: pos.shortAssets.map(enrichAsset),
-                            }));
+                            const list = dataMessage.data;
                             setRawOpenPositions(list);
                         }
                         break;
                     case 'open-orders':
                         {
-                            const list = dataMessage.data.map((order) => ({
-                                ...order,
-                                longAssets: order.longAssets.map((a) => ({
-                                    ...a,
-                                    asset: toDisplaySymbol(a.asset),
-                                })),
-                                shortAssets: order.shortAssets.map((a) => ({
-                                    ...a,
-                                    asset: toDisplaySymbol(a.asset),
-                                })),
-                            }));
+                            const list = dataMessage.data;
                             setOpenOrders(list);
                         }
                         break;
@@ -279,21 +163,7 @@ const useHyperliquidWebSocket = ({ wsUrl, address, enabled = true, }) => {
                         break;
                     case 'twap-details':
                         {
-                            const mapTwapAsset = (a) => {
-                                var _a, _b, _c;
-                                const extractedPrefix = getMarketPrefix(a.asset);
-                                return {
-                                    ...a,
-                                    asset: toDisplaySymbol(a.asset),
-                                    marketPrefix: (_b = (_a = a.marketPrefix) !== null && _a !== void 0 ? _a : extractedPrefix) !== null && _b !== void 0 ? _b : null,
-                                    collateralToken: (_c = a.collateralToken) !== null && _c !== void 0 ? _c : undefined,
-                                };
-                            };
-                            const list = dataMessage.data.map((twap) => ({
-                                ...twap,
-                                longAssets: twap.longAssets.map(mapTwapAsset),
-                                shortAssets: twap.shortAssets.map(mapTwapAsset),
-                            }));
+                            const list = dataMessage.data;
                             setTwapDetails(list);
                         }
                         break;
@@ -303,25 +173,7 @@ const useHyperliquidWebSocket = ({ wsUrl, address, enabled = true, }) => {
                     case 'market-data':
                         {
                             const md = dataMessage.data;
-                            const mapGroup = (g) => ({
-                                ...g,
-                                longAssets: g.longAssets.map((a) => ({
-                                    ...a,
-                                    asset: toDisplaySymbol(a.asset),
-                                })),
-                                shortAssets: g.shortAssets.map((a) => ({
-                                    ...a,
-                                    asset: toDisplaySymbol(a.asset),
-                                })),
-                            });
-                            const mapped = {
-                                active: md.active.map(mapGroup),
-                                topGainers: md.topGainers.map(mapGroup),
-                                topLosers: md.topLosers.map(mapGroup),
-                                highlighted: md.highlighted.map(mapGroup),
-                                watchlist: md.watchlist.map(mapGroup),
-                            };
-                            setMarketData(mapped);
+                            setMarketData(md);
                         }
                         break;
                 }
@@ -457,6 +309,192 @@ const useHyperliquidWebSocket = ({ wsUrl, address, enabled = true, }) => {
     };
 };
 
+const getMarketInfoFromSymbol = (symbol) => {
+    const separatorIndex = symbol.indexOf(':');
+    if (separatorIndex > -1) {
+        const prefix = symbol.slice(0, separatorIndex);
+        const name = symbol.slice(separatorIndex + 1);
+        return {
+            symbolName: name || symbol,
+            marketName: prefix || 'hyperliquid',
+        };
+    }
+    return { symbolName: symbol, marketName: 'hyperliquid' };
+};
+
+/**
+ * Check if two symbols match, handling kPEPE/KPEPE variations
+ * Returns true if symbols match (case-insensitive for k-prefix tokens)
+ */
+function symbolsMatch(assetName, searchSymbol) {
+    // Exact match
+    if (assetName === searchSymbol)
+        return true;
+    // Try case-insensitive match for k-prefix tokens (kPEPE vs KPEPE)
+    if (assetName.toUpperCase() === searchSymbol.toUpperCase()) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Extracts token metadata from aggregated WebData3 contexts and AllMids data
+ */
+class TokenMetadataExtractor {
+    /**
+     * Extracts comprehensive token metadata
+     * @param symbol - Token symbol (e.g., "BTC", "TSLA")
+     * @param perpMetaAssets - Aggregated universe assets (flattened across dexes)
+     * @param finalAssetContexts - Aggregated asset contexts (flattened across dexes)
+     * @param allMids - AllMids data containing current prices
+     * @param activeAssetData - Optional active asset data containing leverage information
+     * @returns TokenMetadata or null if token not found
+     */
+    static extractTokenMetadata(symbol, perpMetaAssets, finalAssetContexts, allMids, activeAssetData, finalAtOICaps) {
+        if (!perpMetaAssets || !finalAssetContexts || !allMids) {
+            return null;
+        }
+        const universeIndex = perpMetaAssets.findIndex((asset) => symbolsMatch(asset.name, symbol));
+        if (universeIndex === -1) {
+            return null;
+        }
+        const universeAsset = perpMetaAssets[universeIndex];
+        const assetCtx = finalAssetContexts[universeIndex];
+        if (!assetCtx) {
+            return null;
+        }
+        // Get current price - prefer assetCtx.midPx as it's already index-matched,
+        // fall back to allMids lookup if midPx is null
+        const actualSymbol = universeAsset.name;
+        let currentPrice = 0;
+        // Primary source: assetCtx.midPx (already properly indexed)
+        if (assetCtx.midPx) {
+            currentPrice = parseFloat(assetCtx.midPx);
+        }
+        // Fallback: allMids lookup
+        if (!currentPrice || isNaN(currentPrice)) {
+            const currentPriceStr = allMids.mids[actualSymbol] || allMids.mids[symbol];
+            currentPrice = currentPriceStr ? parseFloat(currentPriceStr) : 0;
+        }
+        // Get previous day price
+        const prevDayPrice = parseFloat(assetCtx.prevDayPx);
+        // Calculate 24h price change
+        const priceChange24h = currentPrice - prevDayPrice;
+        const priceChange24hPercent = prevDayPrice !== 0 ? (priceChange24h / prevDayPrice) * 100 : 0;
+        // Parse other metadata
+        const netFunding = parseFloat(assetCtx.funding) * 100;
+        const markPrice = parseFloat(assetCtx.markPx);
+        const oraclePrice = parseFloat(assetCtx.oraclePx);
+        // Extract leverage info from activeAssetData if available
+        const tokenActiveData = (activeAssetData === null || activeAssetData === void 0 ? void 0 : activeAssetData[actualSymbol]) || (activeAssetData === null || activeAssetData === void 0 ? void 0 : activeAssetData[symbol]);
+        const leverage = tokenActiveData === null || tokenActiveData === void 0 ? void 0 : tokenActiveData.leverage;
+        const maxTradeSzs = tokenActiveData === null || tokenActiveData === void 0 ? void 0 : tokenActiveData.maxTradeSzs;
+        const availableToTrade = tokenActiveData === null || tokenActiveData === void 0 ? void 0 : tokenActiveData.availableToTrade;
+        const { symbolName, marketName } = getMarketInfoFromSymbol(actualSymbol);
+        const assetName = symbolName;
+        return {
+            assetName,
+            symbolName,
+            marketName,
+            isAtOiCaps: finalAtOICaps
+                ? finalAtOICaps.includes(symbol)
+                : false,
+            currentPrice,
+            prevDayPrice,
+            priceChange24h,
+            priceChange24hPercent,
+            netFunding,
+            maxLeverage: universeAsset.maxLeverage,
+            markPrice,
+            oraclePrice,
+            openInterest: assetCtx.openInterest,
+            dayVolume: assetCtx.dayNtlVlm,
+            leverage,
+            maxTradeSzs,
+            availableToTrade,
+            collateralToken: universeAsset.collateralToken,
+        };
+    }
+    /**
+     * Extracts metadata for multiple tokens
+     * @param tokens - Array of token strings (e.g., "BTC", "TSLA")
+     * @param perpMetaAssets - Aggregated universe assets
+     * @param finalAssetContexts - Aggregated asset contexts
+     * @param allMids - AllMids data
+     * @param activeAssetData - Optional active asset data containing leverage information
+     * @returns Record of token string to TokenMetadata (keys match input tokens exactly)
+     */
+    static extractMultipleTokensMetadata(tokens, perpMetaAssets, finalAssetContexts, allMids, activeAssetData, finalAtOICaps) {
+        const result = {};
+        for (const token of tokens) {
+            result[token] = this.extractTokenMetadata(token, perpMetaAssets, finalAssetContexts, allMids, activeAssetData, finalAtOICaps);
+        }
+        return result;
+    }
+    /**
+     * Checks if token data is available in aggregated universe assets
+     * @param symbol - Token symbol
+     * @param perpMetaAssets - Aggregated universe assets
+     * @returns boolean indicating if token exists in universe
+     */
+    static isTokenAvailable(symbol, perpMetaAssets) {
+        if (!perpMetaAssets)
+            return false;
+        return perpMetaAssets.some((asset) => symbolsMatch(asset.name, symbol));
+    }
+}
+
+const buildOiCapSet = (finalAtOICaps) => new Set((finalAtOICaps !== null && finalAtOICaps !== void 0 ? finalAtOICaps : [])
+    .filter(Boolean)
+    .map((value) => value.toUpperCase()));
+const isAtOiCaps = (symbol, symbolName, oiCapSet) => oiCapSet.has(symbol.toUpperCase()) ||
+    oiCapSet.has(symbolName.toUpperCase());
+const applyMetadataContext = (symbol, metadata, oiCapSet) => {
+    if (!metadata)
+        return null;
+    const { symbolName, marketName } = getMarketInfoFromSymbol(symbol);
+    const assetName = symbolName;
+    return {
+        ...metadata,
+        assetName,
+        symbolName,
+        marketName,
+        isAtOiCaps: isAtOiCaps(symbol, symbolName, oiCapSet),
+    };
+};
+const applyOiCapsToMetadataMap = (tokenMetadata, finalAtOICaps) => {
+    if (!tokenMetadata || Object.keys(tokenMetadata).length === 0) {
+        return tokenMetadata;
+    }
+    const oiCapSet = buildOiCapSet(finalAtOICaps);
+    const next = {};
+    Object.entries(tokenMetadata).forEach(([symbol, metadata]) => {
+        next[symbol] = applyMetadataContext(symbol, metadata, oiCapSet);
+    });
+    return next;
+};
+const buildTokenMetadataMap = ({ perpMetaAssets, finalAssetContexts, allMids, activeAssetData, finalAtOICaps, }) => {
+    if (!perpMetaAssets || !finalAssetContexts || !allMids) {
+        return {};
+    }
+    const oiCapSet = buildOiCapSet(finalAtOICaps);
+    const symbols = perpMetaAssets.map((asset) => asset.name);
+    const metadataMap = TokenMetadataExtractor.extractMultipleTokensMetadata(symbols, perpMetaAssets, finalAssetContexts, allMids, activeAssetData, finalAtOICaps);
+    symbols.forEach((symbol) => {
+        metadataMap[symbol] = applyMetadataContext(symbol, metadataMap[symbol], oiCapSet);
+    });
+    return metadataMap;
+};
+const updateTokenMetadataForSymbols = (prev, symbols, { perpMetaAssets, finalAssetContexts, allMids, activeAssetData, finalAtOICaps, }) => {
+    if (!perpMetaAssets || !finalAssetContexts || !allMids) {
+        return prev;
+    }
+    const oiCapSet = buildOiCapSet(finalAtOICaps);
+    const next = { ...prev };
+    symbols.forEach((symbol) => {
+        next[symbol] = applyMetadataContext(symbol, TokenMetadataExtractor.extractTokenMetadata(symbol, perpMetaAssets, finalAssetContexts, allMids, activeAssetData), oiCapSet);
+    });
+    return next;
+};
 const useHyperliquidData = create((set, get) => ({
     allMids: null,
     activeAssetData: null,
@@ -466,13 +504,30 @@ const useHyperliquidData = create((set, get) => ({
     aggregatedClearingHouseState: null,
     rawClearinghouseStates: null,
     perpMetaAssets: null,
-    allPerpMetaAssets: null,
-    hip3Assets: new Map(),
-    hip3MarketPrefixes: new Map(),
-    setAllMids: (value) => set({ allMids: value }),
-    setActiveAssetData: (value) => set((state) => ({
-        activeAssetData: typeof value === 'function' ? value(state.activeAssetData) : value,
+    tokenMetadata: {},
+    setAllMids: (value) => set((state) => ({
+        allMids: value,
+        tokenMetadata: buildTokenMetadataMap({
+            perpMetaAssets: state.perpMetaAssets,
+            finalAssetContexts: state.finalAssetContexts,
+            allMids: value,
+            activeAssetData: state.activeAssetData,
+            finalAtOICaps: state.finalAtOICaps,
+        }),
     })),
+    setActiveAssetData: (value) => set((state) => {
+        const activeAssetData = typeof value === 'function' ? value(state.activeAssetData) : value;
+        return {
+            activeAssetData,
+            tokenMetadata: buildTokenMetadataMap({
+                perpMetaAssets: state.perpMetaAssets,
+                finalAssetContexts: state.finalAssetContexts,
+                allMids: state.allMids,
+                activeAssetData,
+                finalAtOICaps: state.finalAtOICaps,
+            }),
+        };
+    }),
     deleteActiveAssetData: (key) => {
         set((state) => {
             if (!state.activeAssetData || !(key in state.activeAssetData)) {
@@ -480,7 +535,16 @@ const useHyperliquidData = create((set, get) => ({
             }
             const updated = { ...state.activeAssetData };
             delete updated[key];
-            return { activeAssetData: updated };
+            return {
+                activeAssetData: updated,
+                tokenMetadata: updateTokenMetadataForSymbols(state.tokenMetadata, [key], {
+                    perpMetaAssets: state.perpMetaAssets,
+                    finalAssetContexts: state.finalAssetContexts,
+                    allMids: state.allMids,
+                    activeAssetData: updated,
+                    finalAtOICaps: state.finalAtOICaps,
+                }),
+            };
         });
     },
     addCandleData(symbol, candle) {
@@ -502,20 +566,49 @@ const useHyperliquidData = create((set, get) => ({
         });
     },
     setCandleData: (value) => set({ candleData: value }),
-    upsertActiveAssetData: (key, value) => set((state) => ({
-        activeAssetData: {
-            ...state.activeAssetData,
+    upsertActiveAssetData: (key, value) => set((state) => {
+        var _a;
+        const activeAssetData = {
+            ...((_a = state.activeAssetData) !== null && _a !== void 0 ? _a : {}),
             [key]: value,
-        },
+        };
+        return {
+            activeAssetData,
+            tokenMetadata: updateTokenMetadataForSymbols(state.tokenMetadata, [key], {
+                perpMetaAssets: state.perpMetaAssets,
+                finalAssetContexts: state.finalAssetContexts,
+                allMids: state.allMids,
+                activeAssetData,
+                finalAtOICaps: state.finalAtOICaps,
+            }),
+        };
+    }),
+    setFinalAssetContexts: (value) => set((state) => ({
+        finalAssetContexts: value,
+        tokenMetadata: buildTokenMetadataMap({
+            perpMetaAssets: state.perpMetaAssets,
+            finalAssetContexts: value,
+            allMids: state.allMids,
+            activeAssetData: state.activeAssetData,
+            finalAtOICaps: state.finalAtOICaps,
+        }),
+    })),
+    setFinalAtOICaps: (value) => set((state) => ({
+        finalAtOICaps: value,
+        tokenMetadata: applyOiCapsToMetadataMap(state.tokenMetadata, value),
     })),
-    setFinalAssetContexts: (value) => set({ finalAssetContexts: value }),
-    setFinalAtOICaps: (value) => set({ finalAtOICaps: value }),
     setAggregatedClearingHouseState: (value) => set({ aggregatedClearingHouseState: value }),
     setRawClearinghouseStates: (value) => set({ rawClearinghouseStates: value }),
-    setPerpMetaAssets: (value) => set({ perpMetaAssets: value }),
-    setAllPerpMetaAssets: (value) => set({ allPerpMetaAssets: value }),
-    setHip3Assets: (value) => set({ hip3Assets: value }),
-    setHip3MarketPrefixes: (value) => set({ hip3MarketPrefixes: value }),
+    setPerpMetaAssets: (value) => set((state) => ({
+        perpMetaAssets: value,
+        tokenMetadata: buildTokenMetadataMap({
+            perpMetaAssets: value,
+            finalAssetContexts: state.finalAssetContexts,
+            allMids: state.allMids,
+            activeAssetData: state.activeAssetData,
+            finalAtOICaps: state.finalAtOICaps,
+        }),
+    }))
 }));
 
 /**
@@ -781,6 +874,7 @@ const useHyperliquidNativeWebSocket = ({ address, enabled = true, onUserFills, }
     const { setAllMids, setActiveAssetData, upsertActiveAssetData, setCandleData, deleteCandleSymbol, deleteActiveAssetData, addCandleData, setFinalAssetContexts, setFinalAtOICaps, setAggregatedClearingHouseState, setRawClearinghouseStates, } = useHyperliquidData();
     const { setSpotState } = useUserData();
     const { candleInterval } = useUserSelection$1();
+    const userSummary = useUserData((state) => state.accountSummary);
     const longTokens = useUserSelection$1((s) => s.longTokens);
     const shortTokens = useUserSelection$1((s) => s.shortTokens);
     const selectedTokenSymbols = useMemo(() => [...longTokens, ...shortTokens].map((t) => t.symbol), [longTokens, shortTokens]);
@@ -888,51 +982,20 @@ const useHyperliquidNativeWebSocket = ({ address, enabled = true, onUserFills, }
                     case 'allMids':
                         {
                             const data = response.data;
-                            // Keep BOTH normalized prefixed keys AND display symbol keys
-                            // This ensures xyz:TSLA and flx:TSLA are stored separately,
-                            // while also maintaining backward compatibility with non-prefixed lookups
-                            const mids = {};
-                            Object.entries(data.mids || {}).forEach(([k, v]) => {
-                                // Normalize prefixed keys to lowercase prefix (e.g., "XYZ:TSLA" -> "xyz:TSLA")
-                                // This matches how we look up tokens in the SDK
-                                let normalizedKey = k;
-                                if (k.includes(':')) {
-                                    const [prefix, ...rest] = k.split(':');
-                                    normalizedKey = `${prefix.toLowerCase()}:${rest.join(':')}`;
-                                }
-                                // Store with normalized key
-                                mids[normalizedKey] = v;
-                                // Also store with original key for backward compatibility
-                                if (k !== normalizedKey) {
-                                    mids[k] = v;
-                                }
-                                // Also store with display symbol for backward compatibility
-                                const displayKey = toDisplaySymbol(k);
-                                // Only set display key if it doesn't already exist (avoid overwriting market-specific prices)
-                                if (!(displayKey in mids)) {
-                                    mids[displayKey] = v;
-                                }
-                            });
-                            setAllMids({ mids });
+                            setAllMids(data);
                         }
                         break;
                     case 'activeAssetData':
                         {
                             const assetData = response.data;
-                            const symbol = toDisplaySymbol(assetData.coin);
-                            const normalized = {
-                                ...assetData,
-                                coin: symbol,
-                            };
-                            upsertActiveAssetData(symbol, normalized);
+                            upsertActiveAssetData(assetData.coin, assetData);
                         }
                         break;
                     case 'candle':
                         {
                             const candleDataItem = response.data;
-                            const symbol = toDisplaySymbol(candleDataItem.s || '');
-                            const normalized = { ...candleDataItem, s: symbol };
-                            addCandleData(symbol, normalized);
+                            const symbol = candleDataItem.s || '';
+                            addCandleData(symbol, candleDataItem);
                         }
                         break;
                     case 'spotState':
@@ -1155,9 +1218,8 @@ const useHyperliquidNativeWebSocket = ({ address, enabled = true, onUserFills, }
         setRawClearinghouseStates,
         setSpotState,
     ]);
-    // Subscribe to userFills only after allDexsClearinghouseState data is received
     useEffect(() => {
-        if (!isConnected || !subscribedAddress || !clearinghouseStateReceived)
+        if (!isConnected || !subscribedAddress || !clearinghouseStateReceived || !userSummary)
             return;
         const subscribeUserFills = {
             method: 'subscribe',
@@ -1167,7 +1229,7 @@ const useHyperliquidNativeWebSocket = ({ address, enabled = true, onUserFills, }
             },
         };
         sendJsonMessage(subscribeUserFills);
-    }, [isConnected, subscribedAddress, clearinghouseStateReceived, sendJsonMessage]);
+    }, [isConnected, subscribedAddress, clearinghouseStateReceived, userSummary, sendJsonMessage]);
     // Handle token subscriptions for activeAssetData
     useEffect(() => {
         if (!isConnected || !address)
@@ -1338,381 +1400,116 @@ class AccountSummaryCalculator {
     getClearinghouseState() {
         return this.clearinghouseState || null;
     }
-    /**
-     * Check if real-time data is available
-     */
-    hasRealTimeData() {
-        return !!this.clearinghouseState;
-    }
-}
-
-const useAccountSummary = () => {
-    const context = useContext(PearHyperliquidContext);
-    if (!context) {
-        throw new Error('useAccountSummary must be used within a PearHyperliquidProvider');
-    }
-    const platformAccountSummary = useUserData((state) => state.accountSummary);
-    const aggregatedClearingHouseState = useHyperliquidData((state) => state.aggregatedClearingHouseState);
-    const registeredAgentWallets = useUserData((state) => state.userExtraAgents);
-    const isLoading = useMemo(() => {
-        return !platformAccountSummary || !registeredAgentWallets || !aggregatedClearingHouseState;
-    }, [platformAccountSummary, registeredAgentWallets, aggregatedClearingHouseState]);
-    // Create calculator and compute account summary
-    const calculator = new AccountSummaryCalculator(aggregatedClearingHouseState);
-    const calculated = calculator.calculateAccountSummary(platformAccountSummary, registeredAgentWallets || []);
-    return { data: calculated, isLoading };
-};
-
-function findAssetMeta$4(coinName, perpMetaAssets, knownPrefix, desiredCollateral) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    if (!perpMetaAssets) {
-        return { collateralToken: 'USDC', marketPrefix: null };
-    }
-    if (desiredCollateral) {
-        const collateralMatch = perpMetaAssets.find((a) => a.name === coinName && a.collateralToken === desiredCollateral);
-        if (collateralMatch) {
-            return {
-                collateralToken: (_a = collateralMatch.collateralToken) !== null && _a !== void 0 ? _a : 'USDC',
-                marketPrefix: (_b = collateralMatch.marketPrefix) !== null && _b !== void 0 ? _b : null,
-            };
-        }
-    }
-    if (coinName.includes(':')) {
-        const [prefix, symbol] = coinName.split(':');
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === symbol &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === prefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_c = exactMatch.collateralToken) !== null && _c !== void 0 ? _c : 'USDC',
-                marketPrefix: (_d = exactMatch.marketPrefix) !== null && _d !== void 0 ? _d : null,
-            };
-        }
-    }
-    if (knownPrefix) {
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === coinName &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === knownPrefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_e = exactMatch.collateralToken) !== null && _e !== void 0 ? _e : 'USDC',
-                marketPrefix: (_f = exactMatch.marketPrefix) !== null && _f !== void 0 ? _f : null,
-            };
-        }
-    }
-    const exactMatch = perpMetaAssets.find((a) => a.name === coinName && !a.marketPrefix);
-    if (exactMatch) {
-        return {
-            collateralToken: (_g = exactMatch.collateralToken) !== null && _g !== void 0 ? _g : 'USDC',
-            marketPrefix: (_h = exactMatch.marketPrefix) !== null && _h !== void 0 ? _h : null,
-        };
-    }
-    const hip3Matches = perpMetaAssets.filter((a) => a.name === coinName && a.marketPrefix);
-    if (hip3Matches.length > 0) {
-        if (desiredCollateral) {
-            const collateralMatch = hip3Matches.find((a) => a.collateralToken === desiredCollateral);
-            if (collateralMatch) {
-                return {
-                    collateralToken: (_j = collateralMatch.collateralToken) !== null && _j !== void 0 ? _j : 'USDC',
-                    marketPrefix: (_k = collateralMatch.marketPrefix) !== null && _k !== void 0 ? _k : null,
-                };
-            }
-        }
-        const usdHMatch = hip3Matches.find((a) => a.collateralToken === 'USDH');
-        const chosen = usdHMatch !== null && usdHMatch !== void 0 ? usdHMatch : hip3Matches[0];
-        return {
-            collateralToken: (_l = chosen.collateralToken) !== null && _l !== void 0 ? _l : 'USDC',
-            marketPrefix: (_m = chosen.marketPrefix) !== null && _m !== void 0 ? _m : null,
-        };
-    }
-    return { collateralToken: 'USDC', marketPrefix: null };
-}
-function enrichTradeHistoryAssets(assets, perpMetaAssets) {
-    return assets.map((asset) => {
-        var _a;
-        if (asset.marketPrefix && asset.collateralToken) {
-            return asset;
-        }
-        const meta = findAssetMeta$4(asset.coin, perpMetaAssets, asset.marketPrefix, asset.collateralToken);
-        return {
-            ...asset,
-            marketPrefix: asset.marketPrefix || meta.marketPrefix,
-            collateralToken: (_a = asset.collateralToken) !== null && _a !== void 0 ? _a : meta.collateralToken,
-        };
-    });
-}
-function enrichTradeHistories(histories, perpMetaAssets) {
-    return histories.map((history) => ({
-        ...history,
-        closedLongAssets: enrichTradeHistoryAssets(history.closedLongAssets, perpMetaAssets),
-        closedShortAssets: enrichTradeHistoryAssets(history.closedShortAssets, perpMetaAssets),
-    }));
-}
-const useTradeHistories = () => {
-    const context = useContext(PearHyperliquidContext);
-    if (!context) {
-        throw new Error('useTradeHistories must be used within a PearHyperliquidProvider');
-    }
-    const tradeHistories = useUserData((state) => state.tradeHistories);
-    const allPerpMetaAssets = useHyperliquidData((state) => state.allPerpMetaAssets);
-    const isLoading = useMemo(() => {
-        return tradeHistories === null && context.isConnected;
-    }, [tradeHistories, context.isConnected]);
-    const enrichedTradeHistories = useMemo(() => {
-        if (!tradeHistories)
-            return null;
-        return enrichTradeHistories(tradeHistories, allPerpMetaAssets);
-    }, [tradeHistories, allPerpMetaAssets]);
-    return { data: enrichedTradeHistories, isLoading };
-};
-const useOpenOrders = () => {
-    const context = useContext(PearHyperliquidContext);
-    if (!context) {
-        throw new Error('useOpenOrders must be used within a PearHyperliquidProvider');
-    }
-    const openOrders = useUserData((state) => state.openOrders);
-    const isLoading = useMemo(() => {
-        return openOrders === null && context.isConnected;
-    }, [openOrders, context.isConnected]);
-    return { data: openOrders, isLoading };
-};
-
-const useUserSelection = () => {
-    return useUserSelection$1();
-};
-
-/**
- * Hook to access webData and native WebSocket state
- */
-const useWebData = () => {
-    const context = useContext(PearHyperliquidContext);
-    if (!context) {
-        throw new Error('useWebData must be used within a PearHyperliquidProvider');
-    }
-    const finalAssetContexts = useHyperliquidData((state) => state.finalAssetContexts);
-    const perpMetaAssets = useHyperliquidData((state) => state.perpMetaAssets);
-    const aggregatedClearinghouseState = useHyperliquidData((state) => state.aggregatedClearingHouseState);
-    const finalAtOICaps = useHyperliquidData((state) => state.finalAtOICaps);
-    const hip3Assets = useHyperliquidData((state) => state.hip3Assets);
-    const hip3MarketPrefixes = useHyperliquidData((state) => state.hip3MarketPrefixes);
-    let marketDataBySymbol = {};
-    if (finalAssetContexts && perpMetaAssets) {
-        const result = {};
-        // Build a map of display name -> asset context index (for unique display names)
-        const displayNameToContextIndex = new Map();
-        const seenNames = new Set();
-        let contextIndex = 0;
-        // First pass: map unique display names to their context index
-        for (let index = 0; index < perpMetaAssets.length; index++) {
-            const name = perpMetaAssets[index].name;
-            if (!seenNames.has(name)) {
-                seenNames.add(name);
-                if (contextIndex < finalAssetContexts.length) {
-                    displayNameToContextIndex.set(name, contextIndex);
-                    contextIndex++;
-                }
-            }
-        }
-        // Second pass: create nested entries for all market variants
-        for (let index = 0; index < perpMetaAssets.length; index++) {
-            const universeAsset = perpMetaAssets[index];
-            const displayName = universeAsset.name;
-            const marketPrefix = universeAsset.marketPrefix;
-            const ctxIndex = displayNameToContextIndex.get(displayName);
-            if (ctxIndex !== undefined) {
-                const assetContext = finalAssetContexts[ctxIndex];
-                // Initialize the symbol entry if it doesn't exist
-                if (!result[displayName]) {
-                    result[displayName] = {};
-                }
-                // Use marketPrefix as key for HIP-3 assets, "default" for regular assets
-                const variantKey = marketPrefix || 'default';
-                result[displayName][variantKey] = {
-                    asset: assetContext,
-                    universe: universeAsset,
-                };
-            }
-        }
-        marketDataBySymbol = result;
-    }
-    return {
-        hip3Assets,
-        hip3MarketPrefixes,
-        clearinghouseState: aggregatedClearinghouseState,
-        perpsAtOpenInterestCap: finalAtOICaps,
-        marketDataBySymbol,
-        isConnected: context.nativeIsConnected,
-        error: context.nativeLastError,
-    };
-};
-
-/**
- * Check if two symbols match, handling kPEPE/KPEPE variations
- * Returns true if symbols match (case-insensitive for k-prefix tokens)
- */
-function symbolsMatch(assetName, searchSymbol) {
-    // Exact match
-    if (assetName === searchSymbol)
-        return true;
-    // Try case-insensitive match for k-prefix tokens (kPEPE vs KPEPE)
-    if (assetName.toUpperCase() === searchSymbol.toUpperCase()) {
-        return true;
-    }
-    return false;
-}
-/**
- * Extracts token metadata from aggregated WebData3 contexts and AllMids data
- */
-class TokenMetadataExtractor {
-    /**
-     * Extracts comprehensive token metadata
-     * @param symbol - Token symbol (base symbol without prefix, e.g., "TSLA")
-     * @param perpMetaAssets - Aggregated universe assets (flattened across dexes)
-     * @param finalAssetContexts - Aggregated asset contexts (flattened across dexes)
-     * @param allMids - AllMids data containing current prices
-     * @param activeAssetData - Optional active asset data containing leverage information
-     * @param marketPrefix - Optional market prefix (e.g., "xyz", "flx") for HIP3 multi-market assets
-     * @returns TokenMetadata or null if token not found
-     */
-    static extractTokenMetadata(symbol, perpMetaAssets, finalAssetContexts, allMids, activeAssetData, marketPrefix) {
-        if (!perpMetaAssets || !finalAssetContexts || !allMids) {
-            return null;
-        }
-        // Find token index in aggregated universe
-        // For HIP3 assets, match both name AND marketPrefix
-        // Uses symbolsMatch to handle kPEPE/KPEPE case variations
-        const universeIndex = perpMetaAssets.findIndex((asset) => {
-            if (!symbolsMatch(asset.name, symbol))
-                return false;
-            // If marketPrefix is specified, match it; otherwise match assets without prefix
-            if (marketPrefix) {
-                return asset.marketPrefix === marketPrefix;
-            }
-            // No prefix specified - match non-HIP3 asset (no marketPrefix) or first matching asset
-            return !asset.marketPrefix;
-        });
-        if (universeIndex === -1) {
-            return null;
-        }
-        const universeAsset = perpMetaAssets[universeIndex];
-        const assetCtx = finalAssetContexts[universeIndex];
-        if (!assetCtx) {
-            return null;
-        }
-        // Get current price - prefer assetCtx.midPx as it's already index-matched,
-        // fall back to allMids lookup if midPx is null
-        const actualSymbol = universeAsset.name; // Use actual symbol from universe (handles kPEPE vs KPEPE)
-        const prefixedKeyColon = marketPrefix
-            ? `${marketPrefix}:${actualSymbol}`
-            : null;
-        let currentPrice = 0;
-        // Primary source: assetCtx.midPx (already properly indexed)
-        if (assetCtx.midPx) {
-            currentPrice = parseFloat(assetCtx.midPx);
-        }
-        // Fallback: allMids lookup with multiple key formats for HIP3 markets
-        // Try actual symbol from universe first, then input symbol
-        if (!currentPrice || isNaN(currentPrice)) {
-            const currentPriceStr = (prefixedKeyColon && allMids.mids[prefixedKeyColon]) ||
-                allMids.mids[actualSymbol] ||
-                allMids.mids[symbol];
-            currentPrice = currentPriceStr ? parseFloat(currentPriceStr) : 0;
-        }
-        // Get previous day price
-        const prevDayPrice = parseFloat(assetCtx.prevDayPx);
-        // Calculate 24h price change
-        const priceChange24h = currentPrice - prevDayPrice;
-        const priceChange24hPercent = prevDayPrice !== 0 ? (priceChange24h / prevDayPrice) * 100 : 0;
-        // Parse other metadata
-        const netFunding = parseFloat(assetCtx.funding) * 100;
-        const markPrice = parseFloat(assetCtx.markPx);
-        const oraclePrice = parseFloat(assetCtx.oraclePx);
-        // Extract leverage info from activeAssetData if available
-        // Try prefixed key first (e.g., "xyz:TSLA"), then actual symbol, then input symbol
-        const activeDataKey = prefixedKeyColon && (activeAssetData === null || activeAssetData === void 0 ? void 0 : activeAssetData[prefixedKeyColon])
-            ? prefixedKeyColon
-            : (activeAssetData === null || activeAssetData === void 0 ? void 0 : activeAssetData[actualSymbol])
-                ? actualSymbol
-                : symbol;
-        const tokenActiveData = activeAssetData === null || activeAssetData === void 0 ? void 0 : activeAssetData[activeDataKey];
-        const leverage = tokenActiveData === null || tokenActiveData === void 0 ? void 0 : tokenActiveData.leverage;
-        const maxTradeSzs = tokenActiveData === null || tokenActiveData === void 0 ? void 0 : tokenActiveData.maxTradeSzs;
-        const availableToTrade = tokenActiveData === null || tokenActiveData === void 0 ? void 0 : tokenActiveData.availableToTrade;
-        return {
-            currentPrice,
-            prevDayPrice,
-            priceChange24h,
-            priceChange24hPercent,
-            netFunding,
-            maxLeverage: universeAsset.maxLeverage,
-            markPrice,
-            oraclePrice,
-            openInterest: assetCtx.openInterest,
-            dayVolume: assetCtx.dayNtlVlm,
-            leverage,
-            maxTradeSzs,
-            availableToTrade,
-            collateralToken: universeAsset.collateralToken,
-        };
-    }
-    /**
-     * Extracts metadata for multiple tokens
-     * @param tokens - Array of token objects with symbol and optional marketPrefix
-     * @param perpMetaAssets - Aggregated universe assets
-     * @param finalAssetContexts - Aggregated asset contexts
-     * @param allMids - AllMids data
-     * @param activeAssetData - Optional active asset data containing leverage information
-     * @returns Record of unique key to TokenMetadata. Key is "{prefix}:{symbol}" for HIP3 assets, or just "{symbol}" otherwise
-     */
-    static extractMultipleTokensMetadata(tokens, perpMetaAssets, finalAssetContexts, allMids, activeAssetData) {
-        const result = {};
-        for (const token of tokens) {
-            // Use a unique key that includes the prefix for HIP3 assets
-            // This ensures xyz:TSLA and flx:TSLA get separate entries
-            const resultKey = token.marketPrefix
-                ? `${token.marketPrefix}:${token.symbol}`
-                : token.symbol;
-            result[resultKey] = this.extractTokenMetadata(token.symbol, perpMetaAssets, finalAssetContexts, allMids, activeAssetData, token.marketPrefix);
-        }
-        return result;
-    }
-    /**
-     * Checks if token data is available in aggregated universe assets
-     * @param symbol - Token symbol
-     * @param perpMetaAssets - Aggregated universe assets
-     * @returns boolean indicating if token exists in universe
+    /**
+     * Check if real-time data is available
      */
-    static isTokenAvailable(symbol, perpMetaAssets) {
-        if (!perpMetaAssets)
-            return false;
-        return perpMetaAssets.some((asset) => symbolsMatch(asset.name, symbol));
+    hasRealTimeData() {
+        return !!this.clearinghouseState;
     }
 }
 
+const useAccountSummary = () => {
+    const context = useContext(PearHyperliquidContext);
+    if (!context) {
+        throw new Error('useAccountSummary must be used within a PearHyperliquidProvider');
+    }
+    const platformAccountSummary = useUserData((state) => state.accountSummary);
+    const aggregatedClearingHouseState = useHyperliquidData((state) => state.aggregatedClearingHouseState);
+    const registeredAgentWallets = useUserData((state) => state.userExtraAgents);
+    const isLoading = useMemo(() => {
+        return !platformAccountSummary || !registeredAgentWallets || !aggregatedClearingHouseState;
+    }, [platformAccountSummary, registeredAgentWallets, aggregatedClearingHouseState]);
+    // Create calculator and compute account summary
+    const calculator = new AccountSummaryCalculator(aggregatedClearingHouseState);
+    const calculated = calculator.calculateAccountSummary(platformAccountSummary, registeredAgentWallets || []);
+    return { data: calculated, isLoading };
+};
+
+const selectTokenMetadataBySymbols = (tokenMetadata, symbols) => {
+    const result = {};
+    symbols.forEach((symbol) => {
+        var _a;
+        result[symbol] = (_a = tokenMetadata[symbol]) !== null && _a !== void 0 ? _a : null;
+    });
+    return result;
+};
+const getAssetByName = (tokenMetadata, symbol) => {
+    var _a, _b;
+    if (symbol in tokenMetadata) {
+        return (_a = tokenMetadata[symbol]) !== null && _a !== void 0 ? _a : null;
+    }
+    const normalizedSymbol = symbol.toUpperCase();
+    const matchKey = Object.keys(tokenMetadata).find((key) => key.toUpperCase() === normalizedSymbol);
+    return matchKey ? (_b = tokenMetadata[matchKey]) !== null && _b !== void 0 ? _b : null : null;
+};
+
 /**
- * Parse a token string that may have a market prefix (e.g., "xyz:GOOGL" -> { prefix: "xyz", symbol: "GOOGL" })
- * This allows us to keep the full name (xyz:GOOGL) for URLs/tags while extracting just the symbol for SDK lookups.
+ * Hook to access webData
  */
-function parseTokenWithPrefix(token) {
-    if (token.includes(":")) {
-        const [prefix, ...rest] = token.split(":");
-        const symbol = rest.join(":").toUpperCase();
-        return {
-            prefix: prefix.toLowerCase(),
-            symbol,
-            fullName: `${prefix.toLowerCase()}:${symbol}`,
-        };
+const useMarket = () => {
+    const tokenMetadata = useHyperliquidData((state) => state.tokenMetadata);
+    const allTokenMetadata = useMemo(() => Object.values(tokenMetadata).filter((metadata) => Boolean(metadata)), [tokenMetadata]);
+    const getAssetByName$1 = useCallback((symbol) => getAssetByName(tokenMetadata, symbol), [tokenMetadata]);
+    return { allTokenMetadata, getAssetByName: getAssetByName$1 };
+};
+
+const useTradeHistories = () => {
+    const context = useContext(PearHyperliquidContext);
+    if (!context) {
+        throw new Error('useTradeHistories must be used within a PearHyperliquidProvider');
     }
-    return {
-        prefix: null,
-        symbol: token.toUpperCase(),
-        fullName: token.toUpperCase(),
-    };
-}
+    const tradeHistories = useUserData((state) => state.tradeHistories);
+    const { getAssetByName } = useMarket();
+    const enrichedTradeHistories = useMemo(() => {
+        if (!tradeHistories)
+            return null;
+        return tradeHistories.map((history) => ({
+            ...history,
+            closedLongAssets: history.closedLongAssets.map((asset) => ({
+                ...asset,
+                metadata: getAssetByName(asset.coin),
+            })),
+            closedShortAssets: history.closedShortAssets.map((asset) => ({
+                ...asset,
+                metadata: getAssetByName(asset.coin),
+            })),
+        }));
+    }, [tradeHistories, getAssetByName]);
+    const isLoading = useMemo(() => {
+        return tradeHistories === null && context.isConnected;
+    }, [tradeHistories, context.isConnected]);
+    return { data: enrichedTradeHistories, isLoading };
+};
+const useOpenOrders = () => {
+    const context = useContext(PearHyperliquidContext);
+    if (!context) {
+        throw new Error('useOpenOrders must be used within a PearHyperliquidProvider');
+    }
+    const openOrders = useUserData((state) => state.openOrders);
+    const { getAssetByName } = useMarket();
+    const enrichedOpenOrders = useMemo(() => {
+        if (!openOrders)
+            return null;
+        const mapAssets = (assets) => (assets !== null && assets !== void 0 ? assets : []).map((asset) => ({
+            ...asset,
+            metadata: getAssetByName(asset.asset),
+        }));
+        return openOrders.map((order) => ({
+            ...order,
+            longAssets: mapAssets(order.longAssets),
+            shortAssets: mapAssets(order.shortAssets),
+        }));
+    }, [openOrders, getAssetByName]);
+    const isLoading = useMemo(() => {
+        return openOrders === null && context.isConnected;
+    }, [openOrders, context.isConnected]);
+    return { data: enrichedOpenOrders, isLoading };
+};
+
+const useUserSelection = () => {
+    return useUserSelection$1();
+};
+
 const useTokenSelectionMetadataStore = create((set) => ({
     isPriceDataReady: false,
     isLoading: true,
@@ -1728,59 +1525,18 @@ const useTokenSelectionMetadataStore = create((set) => ({
     maxLeverage: 0,
     minMargin: 0,
     leverageMatched: true,
-    recompute: ({ perpMetaAssets, finalAssetContexts, allMids, activeAssetData, marketData, longTokens, shortTokens, }) => {
-        const isPriceDataReady = !!(perpMetaAssets &&
-            finalAssetContexts &&
-            allMids);
-        // Parse tokens - handle prefixed tokens like "xyz:GOOGL" by extracting the symbol and market prefix
-        // The full name (xyz:GOOGL) is kept as the metadata key for UI consistency
-        const parsedLongTokens = longTokens.map((t) => ({
-            ...t,
-            parsed: parseTokenWithPrefix(t.symbol),
-        }));
-        const parsedShortTokens = shortTokens.map((t) => ({
-            ...t,
-            parsed: parseTokenWithPrefix(t.symbol),
-        }));
-        // Extract base symbols with their market prefixes for SDK lookups
-        // This ensures xyz:TSLA and flx:TSLA get different market data
-        const longTokensForLookup = parsedLongTokens.map((t) => ({
-            symbol: t.parsed.symbol,
-            marketPrefix: t.parsed.prefix,
-        }));
-        const shortTokensForLookup = parsedShortTokens.map((t) => ({
-            symbol: t.parsed.symbol,
-            marketPrefix: t.parsed.prefix,
-        }));
-        // Also extract just the base symbols (without prefix) for lookups that don't support prefixes
-        const longBaseSymbols = longTokensForLookup.map((t) => t.symbol);
-        const shortBaseSymbols = shortTokensForLookup.map((t) => t.symbol);
-        // Get metadata using base symbols with market prefix for proper market differentiation
-        const longBaseMetadata = isPriceDataReady
-            ? TokenMetadataExtractor.extractMultipleTokensMetadata(longTokensForLookup, perpMetaAssets, finalAssetContexts, allMids, activeAssetData)
+    recompute: ({ perpMetaAssets, tokenMetadata, marketData, longTokens, shortTokens, }) => {
+        const isPriceDataReady = Object.keys(tokenMetadata).length > 0;
+        // Get token symbols for lookups
+        const longSymbols = longTokens.map((t) => t.symbol);
+        const shortSymbols = shortTokens.map((t) => t.symbol);
+        // Get metadata
+        const longTokensMetadata = isPriceDataReady
+            ? selectTokenMetadataBySymbols(tokenMetadata, longSymbols)
             : {};
-        const shortBaseMetadata = isPriceDataReady
-            ? TokenMetadataExtractor.extractMultipleTokensMetadata(shortTokensForLookup, perpMetaAssets, finalAssetContexts, allMids, activeAssetData)
+        const shortTokensMetadata = isPriceDataReady
+            ? selectTokenMetadataBySymbols(tokenMetadata, shortSymbols)
             : {};
-        // Re-map metadata using original full names (with prefix) as keys for UI consistency
-        // The extractor now keys by "{prefix}:{symbol}" for prefixed tokens, which matches our parsed.fullName
-        const longTokensMetadata = {};
-        parsedLongTokens.forEach((t) => {
-            var _a;
-            // Use the full name (e.g., "xyz:TSLA") as the lookup key since extractor uses the same format
-            const lookupKey = t.parsed.prefix
-                ? `${t.parsed.prefix}:${t.parsed.symbol}`
-                : t.parsed.symbol;
-            longTokensMetadata[t.symbol] = (_a = longBaseMetadata[lookupKey]) !== null && _a !== void 0 ? _a : null;
-        });
-        const shortTokensMetadata = {};
-        parsedShortTokens.forEach((t) => {
-            var _a;
-            const lookupKey = t.parsed.prefix
-                ? `${t.parsed.prefix}:${t.parsed.symbol}`
-                : t.parsed.symbol;
-            shortTokensMetadata[t.symbol] = (_a = shortBaseMetadata[lookupKey]) !== null && _a !== void 0 ? _a : null;
-        });
         // Determine loading state
         const allTokens = [...longTokens, ...shortTokens];
         const isLoading = (() => {
@@ -1795,13 +1551,12 @@ const useTokenSelectionMetadataStore = create((set) => ({
             return allTokens.some((token) => !allMetadata[token.symbol]);
         })();
         // Open interest and volume (from market data for matching asset basket)
-        // Use base symbols (without prefix) for matching against market data
         const { openInterest, volume } = (() => {
             const empty = { openInterest: "0", volume: "0" };
             if (!(marketData === null || marketData === void 0 ? void 0 : marketData.active) || (!longTokens.length && !shortTokens.length))
                 return empty;
-            const selectedLong = longBaseSymbols.slice().sort();
-            const selectedShort = shortBaseSymbols.slice().sort();
+            const selectedLong = longSymbols.slice().sort();
+            const selectedShort = shortSymbols.slice().sort();
             const match = marketData.active.find((item) => {
                 const longs = [...item.longAssets].sort();
                 const shorts = [...item.shortAssets].sort();
@@ -1894,27 +1649,18 @@ const useTokenSelectionMetadataStore = create((set) => ({
             return totalFunding;
         })();
         // Max leverage (maximum across all tokens)
-        // Use tokens with their market prefixes for proper lookup in perpMetaAssets
         const maxLeverage = (() => {
             if (!perpMetaAssets)
                 return 0;
-            const allTokensForLookup = [
-                ...longTokensForLookup,
-                ...shortTokensForLookup,
-            ];
-            if (allTokensForLookup.length === 0)
+            const allSymbols = [...longSymbols, ...shortSymbols];
+            if (allSymbols.length === 0)
                 return 0;
             let maxLev = 0;
-            allTokensForLookup.forEach(({ symbol, marketPrefix }) => {
-                // Match by both name AND marketPrefix for HIP3 assets
-                const tokenUniverse = perpMetaAssets.find((u) => u.name === symbol &&
-                    (marketPrefix
-                        ? u.marketPrefix === marketPrefix
-                        : !u.marketPrefix));
-                // Fallback to just matching by name if no exact match
-                const fallbackUniverse = tokenUniverse || perpMetaAssets.find((u) => u.name === symbol);
-                if (fallbackUniverse === null || fallbackUniverse === void 0 ? void 0 : fallbackUniverse.maxLeverage)
-                    maxLev = Math.max(maxLev, fallbackUniverse.maxLeverage);
+            allSymbols.forEach((symbol) => {
+                const tokenUniverse = perpMetaAssets.find((u) => u.name === symbol);
+                if (tokenUniverse === null || tokenUniverse === void 0 ? void 0 : tokenUniverse.maxLeverage) {
+                    maxLev = Math.max(maxLev, tokenUniverse.maxLeverage);
+                }
             });
             return maxLev;
         })();
@@ -1968,9 +1714,7 @@ const useTokenSelectionMetadata = () => {
         throw new Error('useTokenSelection must be used within PearHyperliquidProvider');
     }
     const perpMetaAssets = useHyperliquidData((state) => state.perpMetaAssets);
-    const finalAssetContexts = useHyperliquidData((state) => state.finalAssetContexts);
-    const allMids = useHyperliquidData((state) => state.allMids);
-    const activeAssetData = useHyperliquidData((state) => state.activeAssetData);
+    const tokenMetadata = useHyperliquidData((state) => state.tokenMetadata);
     const marketData = useMarketData((state) => state.marketData);
     const { longTokens, shortTokens } = useUserSelection$1();
     const { isLoading, isPriceDataReady, longTokensMetadata, shortTokensMetadata, weightedRatio, weightedRatio24h, priceRatio, priceRatio24h, openInterest, volume, sumNetFunding, maxLeverage, minMargin, leverageMatched, recompute, } = useTokenSelectionMetadataStore();
@@ -1978,16 +1722,14 @@ const useTokenSelectionMetadata = () => {
     useEffect(() => {
         recompute({
             perpMetaAssets,
-            finalAssetContexts,
-            allMids,
-            activeAssetData: activeAssetData || null,
+            tokenMetadata,
             marketData: marketData || null,
             longTokens,
             shortTokens,
         });
         // We want to recompute when token lists or upstream data change
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [perpMetaAssets, finalAssetContexts, allMids, activeAssetData, JSON.stringify(longTokens), JSON.stringify(shortTokens)]);
+    }, [perpMetaAssets, tokenMetadata, JSON.stringify(longTokens), JSON.stringify(shortTokens)]);
     return {
         // Loading states
         isLoading,
@@ -6114,10 +5856,9 @@ function addAuthInterceptors(params) {
 /**
  * Fetch historical candle data from HyperLiquid API
  */
-const fetchHistoricalCandles = async (coin, startTime, endTime, interval, hip3Assets) => {
-    const backendCoin = toBackendSymbol(coin, hip3Assets);
+const fetchHistoricalCandles = async (coin, startTime, endTime, interval) => {
     const request = {
-        req: { coin: backendCoin, startTime, endTime, interval },
+        req: { coin, startTime, endTime, interval },
         type: 'candleSnapshot',
     };
     try {
@@ -6274,10 +6015,9 @@ const useHistoricalPriceData = () => {
             setTokenLoading(token.symbol, true);
         });
         try {
-            const hip3Assets = useHyperliquidData.getState().hip3Assets;
             const fetchPromises = tokensToFetch.map(async (token) => {
                 try {
-                    const response = await fetchHistoricalCandles(token.symbol, startTime, endTime, interval, hip3Assets);
+                    const response = await fetchHistoricalCandles(token.symbol, startTime, endTime, interval);
                     addHistoricalPriceData(token.symbol, interval, response.data, { start: startTime, end: endTime });
                     return { symbol: token.symbol, candles: response.data, success: true };
                 }
@@ -6825,24 +6565,14 @@ function useAgentWallet() {
  * @throws MinimumPositionSizeError if any asset has less than $11 USD value
  * @throws MaxAssetsPerLegError if any leg exceeds the maximum allowed assets (15)
  */
-async function createPosition(baseUrl, payload, hip3Assets) {
+async function createPosition(baseUrl, payload) {
     // Validate maximum assets per leg before creating position
     validateMaxAssetsPerLeg(payload.longAssets, payload.shortAssets);
     // Validate minimum asset size before creating position
     validateMinimumAssetSize(payload.usdValue, payload.longAssets, payload.shortAssets);
     const url = joinUrl(baseUrl, "/positions");
-    // Translate display symbols to backend format
-    const mapAssets = (arr) => arr === null || arr === void 0 ? void 0 : arr.map((a) => ({ ...a, asset: toBackendSymbol(a.asset, hip3Assets) }));
-    const translatedPayload = {
-        ...payload,
-        longAssets: mapAssets(payload.longAssets),
-        shortAssets: mapAssets(payload.shortAssets),
-        assetName: payload.assetName
-            ? toBackendSymbol(payload.assetName, hip3Assets)
-            : undefined,
-    };
     try {
-        const resp = await apiClient.post(url, translatedPayload, {
+        const resp = await apiClient.post(url, payload, {
             headers: {
                 "Content-Type": "application/json",
             },
@@ -6934,15 +6664,10 @@ async function adjustPosition(baseUrl, positionId, payload) {
         throw toApiError(error);
     }
 }
-async function adjustAdvancePosition(baseUrl, positionId, payload, hip3Assets) {
+async function adjustAdvancePosition(baseUrl, positionId, payload) {
     const url = joinUrl(baseUrl, `/positions/${positionId}/adjust-advance`);
-    const mapAssets = (arr) => arr === null || arr === void 0 ? void 0 : arr.map((a) => ({ ...a, asset: toBackendSymbol(a.asset, hip3Assets) }));
-    const translatedPayload = (payload || []).map((item) => ({
-        longAssets: mapAssets(item.longAssets),
-        shortAssets: mapAssets(item.shortAssets),
-    }));
     try {
-        const resp = await apiClient.post(url, translatedPayload, {
+        const resp = await apiClient.post(url, payload, {
             headers: {
                 "Content-Type": "application/json",
             },
@@ -7002,7 +6727,7 @@ async function updateLeverage(baseUrl, positionId, payload) {
     }
 }
 
-const calculatePositionAsset = (asset, currentPrice, totalInitialPositionSize, leverage, isLong = true) => {
+const calculatePositionAsset = (asset, currentPrice, totalInitialPositionSize, leverage, metadata, isLong = true) => {
     var _a;
     const entryNotional = asset.entryPrice * asset.size;
     const currentNotional = currentPrice * asset.size;
@@ -7021,13 +6746,12 @@ const calculatePositionAsset = (asset, currentPrice, totalInitialPositionSize, l
         entryPositionValue: entryNotional,
         initialWeight: totalInitialPositionSize > 0 ? entryNotional / totalInitialPositionSize : 0,
         fundingPaid: (_a = asset.fundingPaid) !== null && _a !== void 0 ? _a : 0,
-        // Preserve market metadata from raw asset (if provided by backend)
-        marketPrefix: asset.marketPrefix,
-        collateralToken: asset.collateralToken,
+        metadata,
     };
 };
-const buildPositionValue = (rawPositions, clearinghouseState, allMids) => {
+const buildPositionValue = (rawPositions, clearinghouseState, getAssetByName) => {
     return rawPositions.map((position) => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let mappedPosition = {
             positionId: position.positionId,
             address: position.address,
@@ -7045,11 +6769,12 @@ const buildPositionValue = (rawPositions, clearinghouseState, allMids) => {
         const totalInitialPositionSize = position.longAssets.reduce((acc, asset) => acc + asset.entryPrice * asset.size, 0) +
             position.shortAssets.reduce((acc, asset) => acc + asset.entryPrice * asset.size, 0);
         mappedPosition.longAssets = position.longAssets.map((longAsset) => {
-            var _a, _b, _c;
-            const currentPrice = parseFloat(allMids.mids[longAsset.coin]);
-            const assetState = (_a = clearinghouseState.assetPositions.find((ap) => toDisplaySymbol(ap.position.coin) === longAsset.coin)) === null || _a === void 0 ? void 0 : _a.position;
-            const leverage = (_c = (_b = assetState === null || assetState === void 0 ? void 0 : assetState.leverage) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : longAsset.leverage;
-            const mappedPositionAssets = calculatePositionAsset(longAsset, currentPrice, totalInitialPositionSize, leverage, true);
+            var _a, _b, _c, _d;
+            const metadata = getAssetByName(longAsset.coin);
+            const currentPrice = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.currentPrice) !== null && _a !== void 0 ? _a : 0;
+            const assetState = (_b = clearinghouseState.assetPositions.find((ap) => ap.position.coin === longAsset.coin)) === null || _b === void 0 ? void 0 : _b.position;
+            const leverage = (_d = (_c = assetState === null || assetState === void 0 ? void 0 : assetState.leverage) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : longAsset.leverage;
+            const mappedPositionAssets = calculatePositionAsset(longAsset, currentPrice, totalInitialPositionSize, leverage, metadata, true);
             mappedPosition.entryPositionValue +=
                 mappedPositionAssets.entryPositionValue;
             mappedPosition.unrealizedPnl += mappedPositionAssets.unrealizedPnl;
@@ -7060,11 +6785,12 @@ const buildPositionValue = (rawPositions, clearinghouseState, allMids) => {
             return mappedPositionAssets;
         });
         mappedPosition.shortAssets = position.shortAssets.map((shortAsset) => {
-            var _a, _b, _c;
-            const currentPrice = parseFloat(allMids.mids[shortAsset.coin]);
-            const assetState = (_a = clearinghouseState.assetPositions.find((ap) => toDisplaySymbol(ap.position.coin) === shortAsset.coin)) === null || _a === void 0 ? void 0 : _a.position;
-            const leverage = (_c = (_b = assetState === null || assetState === void 0 ? void 0 : assetState.leverage) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : shortAsset.leverage;
-            const mappedPositionAssets = calculatePositionAsset(shortAsset, currentPrice, totalInitialPositionSize, leverage, false);
+            var _a, _b, _c, _d;
+            const metadata = getAssetByName(shortAsset.coin);
+            const currentPrice = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.currentPrice) !== null && _a !== void 0 ? _a : 0;
+            const assetState = (_b = clearinghouseState.assetPositions.find((ap) => ap.position.coin === shortAsset.coin)) === null || _b === void 0 ? void 0 : _b.position;
+            const leverage = (_d = (_c = assetState === null || assetState === void 0 ? void 0 : assetState.leverage) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : shortAsset.leverage;
+            const mappedPositionAssets = calculatePositionAsset(shortAsset, currentPrice, totalInitialPositionSize, leverage, metadata, false);
             mappedPosition.entryPositionValue +=
                 mappedPositionAssets.entryPositionValue;
             mappedPosition.unrealizedPnl += mappedPositionAssets.unrealizedPnl;
@@ -7079,8 +6805,8 @@ const buildPositionValue = (rawPositions, clearinghouseState, allMids) => {
         if (position.longAssets.length === 1 && position.shortAssets.length === 1) {
             const long = position.longAssets[0];
             const short = position.shortAssets[0];
-            const longMark = parseFloat(allMids.mids[long.coin]);
-            const shortMark = parseFloat(allMids.mids[short.coin]);
+            const longMark = (_b = (_a = getAssetByName(long.coin)) === null || _a === void 0 ? void 0 : _a.currentPrice) !== null && _b !== void 0 ? _b : 0;
+            const shortMark = (_d = (_c = getAssetByName(short.coin)) === null || _c === void 0 ? void 0 : _c.currentPrice) !== null && _d !== void 0 ? _d : 0;
             if (long.size > 0 && short.size > 0) {
                 mappedPosition.entryPriceRatio = long.entryPrice / short.entryPrice;
                 mappedPosition.markPriceRatio = longMark / shortMark;
@@ -7096,13 +6822,13 @@ const buildPositionValue = (rawPositions, clearinghouseState, allMids) => {
         }
         if (position.longAssets.length === 1 && position.shortAssets.length === 0) {
             const long = position.longAssets[0];
-            const longMark = parseFloat(allMids.mids[long.coin]);
+            const longMark = (_f = (_e = getAssetByName(long.coin)) === null || _e === void 0 ? void 0 : _e.currentPrice) !== null && _f !== void 0 ? _f : 0;
             mappedPosition.entryPriceRatio = long.entryPrice;
             mappedPosition.markPriceRatio = longMark;
         }
         if (position.longAssets.length === 0 && position.shortAssets.length === 1) {
             const short = position.shortAssets[0];
-            const shortMark = parseFloat(allMids.mids[short.coin]);
+            const shortMark = (_h = (_g = getAssetByName(short.coin)) === null || _g === void 0 ? void 0 : _g.currentPrice) !== null && _h !== void 0 ? _h : 0;
             mappedPosition.entryPriceRatio = short.entryPrice;
             mappedPosition.markPriceRatio = shortMark;
         }
@@ -7112,93 +6838,14 @@ const buildPositionValue = (rawPositions, clearinghouseState, allMids) => {
     });
 };
 
-function findAssetMeta$3(coinName, perpMetaAssets, knownPrefix, desiredCollateral) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    if (!perpMetaAssets) {
-        return { collateralToken: 'USDC', marketPrefix: null };
-    }
-    if (desiredCollateral) {
-        const collateralMatch = perpMetaAssets.find((a) => a.name === coinName && a.collateralToken === desiredCollateral);
-        if (collateralMatch) {
-            return {
-                collateralToken: (_a = collateralMatch.collateralToken) !== null && _a !== void 0 ? _a : 'USDC',
-                marketPrefix: (_b = collateralMatch.marketPrefix) !== null && _b !== void 0 ? _b : null,
-            };
-        }
-    }
-    if (coinName.includes(':')) {
-        const [prefix, symbol] = coinName.split(':');
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === symbol &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === prefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_c = exactMatch.collateralToken) !== null && _c !== void 0 ? _c : 'USDC',
-                marketPrefix: (_d = exactMatch.marketPrefix) !== null && _d !== void 0 ? _d : null,
-            };
-        }
-    }
-    if (knownPrefix) {
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === coinName &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === knownPrefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_e = exactMatch.collateralToken) !== null && _e !== void 0 ? _e : 'USDC',
-                marketPrefix: (_f = exactMatch.marketPrefix) !== null && _f !== void 0 ? _f : null,
-            };
-        }
-    }
-    const regularAsset = perpMetaAssets.find((a) => a.name === coinName && !a.marketPrefix);
-    if (regularAsset) {
-        return {
-            collateralToken: (_g = regularAsset.collateralToken) !== null && _g !== void 0 ? _g : 'USDC',
-            marketPrefix: null,
-        };
-    }
-    const hip3Asset = perpMetaAssets.find((a) => a.name === coinName && a.marketPrefix);
-    if (hip3Asset) {
-        return {
-            collateralToken: (_h = hip3Asset.collateralToken) !== null && _h !== void 0 ? _h : 'USDC',
-            marketPrefix: (_j = hip3Asset.marketPrefix) !== null && _j !== void 0 ? _j : null,
-        };
-    }
-    return { collateralToken: 'USDC', marketPrefix: null };
-}
-function enrichPositionAssets(assets, perpMetaAssets) {
-    return assets.map((asset) => {
-        var _a;
-        if (asset.marketPrefix && asset.collateralToken) {
-            return asset;
-        }
-        const meta = findAssetMeta$3(asset.coin, perpMetaAssets, asset.marketPrefix, asset.collateralToken);
-        return {
-            ...asset,
-            marketPrefix: asset.marketPrefix || meta.marketPrefix,
-            collateralToken: (_a = asset.collateralToken) !== null && _a !== void 0 ? _a : meta.collateralToken,
-        };
-    });
-}
-function enrichPositions(positions, perpMetaAssets) {
-    return positions.map((position) => ({
-        ...position,
-        longAssets: enrichPositionAssets(position.longAssets, perpMetaAssets),
-        shortAssets: enrichPositionAssets(position.shortAssets, perpMetaAssets),
-    }));
-}
 function usePosition() {
     const context = useContext(PearHyperliquidContext);
     if (!context) {
         throw new Error('usePosition must be used within a PearHyperliquidProvider');
     }
     const { apiBaseUrl, isConnected } = context;
-    const hip3Assets = useHyperliquidData((s) => s.hip3Assets);
     const createPosition$1 = async (payload) => {
-        return createPosition(apiBaseUrl, payload, hip3Assets);
+        return createPosition(apiBaseUrl, payload);
     };
     const updateRiskParameters$1 = async (positionId, payload) => {
         return updateRiskParameters(apiBaseUrl, positionId, payload);
@@ -7213,7 +6860,7 @@ function usePosition() {
         return adjustPosition(apiBaseUrl, positionId, payload);
     };
     const adjustAdvancePosition$1 = async (positionId, payload) => {
-        return adjustAdvancePosition(apiBaseUrl, positionId, payload, hip3Assets);
+        return adjustAdvancePosition(apiBaseUrl, positionId, payload);
     };
     const updateLeverage$1 = async (positionId, leverage) => {
         return updateLeverage(apiBaseUrl, positionId, { leverage });
@@ -7221,22 +6868,18 @@ function usePosition() {
     // Open positions using WS data, with derived values
     const userOpenPositions = useUserData((state) => state.rawOpenPositions);
     const aggregatedClearingHouseState = useHyperliquidData((state) => state.aggregatedClearingHouseState);
-    const allMids = useHyperliquidData((state) => state.allMids);
-    const allPerpMetaAssets = useHyperliquidData((state) => state.allPerpMetaAssets);
+    const tokenMetadata = useHyperliquidData((state) => state.tokenMetadata);
+    const { getAssetByName } = useMarket();
     const isLoading = useMemo(() => {
         return userOpenPositions === null && isConnected;
     }, [userOpenPositions, isConnected]);
     const openPositions = useMemo(() => {
-        if (!userOpenPositions || !aggregatedClearingHouseState || !allMids)
+        if (!userOpenPositions ||
+            !aggregatedClearingHouseState ||
+            Object.keys(tokenMetadata).length === 0)
             return null;
-        const positions = buildPositionValue(userOpenPositions, aggregatedClearingHouseState, allMids);
-        return enrichPositions(positions, allPerpMetaAssets);
-    }, [
-        userOpenPositions,
-        aggregatedClearingHouseState,
-        allMids,
-        allPerpMetaAssets,
-    ]);
+        return buildPositionValue(userOpenPositions, aggregatedClearingHouseState, getAssetByName);
+    }, [userOpenPositions, aggregatedClearingHouseState, tokenMetadata, getAssetByName]);
     return {
         createPosition: createPosition$1,
         updateRiskParameters: updateRiskParameters$1,
@@ -7319,98 +6962,14 @@ async function executeSpotOrder(baseUrl, payload) {
     }
 }
 
-function findAssetMeta$2(assetName, perpMetaAssets, knownPrefix, desiredCollateral) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    if (!perpMetaAssets) {
-        return { collateralToken: 'USDC', marketPrefix: null };
-    }
-    if (desiredCollateral) {
-        const collateralMatch = perpMetaAssets.find((a) => a.name === assetName && a.collateralToken === desiredCollateral);
-        if (collateralMatch) {
-            return {
-                collateralToken: (_a = collateralMatch.collateralToken) !== null && _a !== void 0 ? _a : 'USDC',
-                marketPrefix: (_b = collateralMatch.marketPrefix) !== null && _b !== void 0 ? _b : null,
-            };
-        }
-    }
-    if (assetName.includes(':')) {
-        const [prefix, symbol] = assetName.split(':');
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === symbol &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === prefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_c = exactMatch.collateralToken) !== null && _c !== void 0 ? _c : 'USDC',
-                marketPrefix: (_d = exactMatch.marketPrefix) !== null && _d !== void 0 ? _d : null,
-            };
-        }
-    }
-    if (knownPrefix) {
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === assetName &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === knownPrefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_e = exactMatch.collateralToken) !== null && _e !== void 0 ? _e : 'USDC',
-                marketPrefix: (_f = exactMatch.marketPrefix) !== null && _f !== void 0 ? _f : null,
-            };
-        }
-    }
-    const regularAsset = perpMetaAssets.find((a) => a.name === assetName && !a.marketPrefix);
-    if (regularAsset) {
-        return {
-            collateralToken: (_g = regularAsset.collateralToken) !== null && _g !== void 0 ? _g : 'USDC',
-            marketPrefix: null,
-        };
-    }
-    const hip3Assets = perpMetaAssets.filter((a) => a.name === assetName && a.marketPrefix);
-    if (hip3Assets.length > 0) {
-        if (desiredCollateral) {
-            const collateralMatch = hip3Assets.find((a) => a.collateralToken === desiredCollateral);
-            if (collateralMatch) {
-                return {
-                    collateralToken: (_h = collateralMatch.collateralToken) !== null && _h !== void 0 ? _h : 'USDC',
-                    marketPrefix: (_j = collateralMatch.marketPrefix) !== null && _j !== void 0 ? _j : null,
-                };
-            }
-        }
-        const usdHMatch = hip3Assets.find((a) => a.collateralToken === 'USDH');
-        const chosen = usdHMatch !== null && usdHMatch !== void 0 ? usdHMatch : hip3Assets[0];
-        return {
-            collateralToken: (_k = chosen.collateralToken) !== null && _k !== void 0 ? _k : 'USDC',
-            marketPrefix: (_l = chosen.marketPrefix) !== null && _l !== void 0 ? _l : null,
-        };
-    }
-    return { collateralToken: 'USDC', marketPrefix: null };
-}
-function enrichOrderAssets$1(assets, perpMetaAssets) {
-    if (!assets)
-        return [];
-    return assets.map((asset) => {
-        var _a;
-        if (asset.marketPrefix && asset.collateralToken) {
-            return asset;
-        }
-        const meta = findAssetMeta$2(asset.asset, perpMetaAssets, asset.marketPrefix, asset.collateralToken);
-        return {
-            ...asset,
-            marketPrefix: asset.marketPrefix || meta.marketPrefix,
-            collateralToken: (_a = asset.collateralToken) !== null && _a !== void 0 ? _a : meta.collateralToken,
-        };
-    });
-}
 function useOrders() {
     const context = useContext(PearHyperliquidContext);
     if (!context)
         throw new Error('useOrders must be used within a PearHyperliquidProvider');
     const { apiBaseUrl } = context;
     const openOrders = useUserData((state) => state.openOrders);
-    const allPerpMetaAssets = useHyperliquidData((state) => state.allPerpMetaAssets);
     const isLoading = useMemo(() => openOrders === null && context.isConnected, [openOrders, context.isConnected]);
+    const { getAssetByName } = useMarket();
     const { openPositions } = usePosition();
     const positionsById = useMemo(() => {
         const map = new Map();
@@ -7423,22 +6982,26 @@ function useOrders() {
     const enrichedOpenOrders = useMemo(() => {
         if (!openOrders)
             return null;
+        const mapOrderAssets = (assets) => assets.map((asset) => ({
+            ...asset,
+            metadata: getAssetByName(asset.asset),
+        }));
         return openOrders.map((ord) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g;
             const isTpSl = ord.orderType === 'TP' || ord.orderType === 'SL';
             const hasAssets = ((_b = (_a = ord.longAssets) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 || ((_d = (_c = ord.shortAssets) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 0;
             const pos = positionsById.get((_e = ord.positionId) !== null && _e !== void 0 ? _e : '');
             let enrichedOrd = {
                 ...ord,
-                longAssets: enrichOrderAssets$1(ord.longAssets, allPerpMetaAssets),
-                shortAssets: enrichOrderAssets$1(ord.shortAssets, allPerpMetaAssets),
+                longAssets: mapOrderAssets((_f = ord.longAssets) !== null && _f !== void 0 ? _f : []),
+                shortAssets: mapOrderAssets((_g = ord.shortAssets) !== null && _g !== void 0 ? _g : []),
             };
+            // For TP/SL orders without assets, derive them from the position
             if (isTpSl && !hasAssets && pos) {
                 const mapAssets = (arr) => arr.map((a) => ({
                     asset: a.coin,
                     weight: a.initialWeight,
-                    marketPrefix: a.marketPrefix,
-                    collateralToken: a.collateralToken,
+                    metadata: getAssetByName(a.coin),
                 }));
                 enrichedOrd = {
                     ...enrichedOrd,
@@ -7448,7 +7011,7 @@ function useOrders() {
             }
             return enrichedOrd;
         });
-    }, [openOrders, positionsById, allPerpMetaAssets]);
+    }, [openOrders, positionsById, getAssetByName]);
     const adjustOrder$1 = async (orderId, payload) => {
         return adjustOrder(apiBaseUrl, orderId, payload);
     };
@@ -7506,108 +7069,27 @@ function useSpotOrder() {
     };
 }
 
-function findAssetMeta$1(assetName, perpMetaAssets, knownPrefix, desiredCollateral) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    if (!perpMetaAssets) {
-        return { collateralToken: 'USDC', marketPrefix: null };
-    }
-    if (desiredCollateral) {
-        const collateralMatch = perpMetaAssets.find((a) => a.name === assetName && a.collateralToken === desiredCollateral);
-        if (collateralMatch) {
-            return {
-                collateralToken: (_a = collateralMatch.collateralToken) !== null && _a !== void 0 ? _a : 'USDC',
-                marketPrefix: (_b = collateralMatch.marketPrefix) !== null && _b !== void 0 ? _b : null,
-            };
-        }
-    }
-    if (assetName.includes(':')) {
-        const [prefix, symbol] = assetName.split(':');
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === symbol &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === prefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_c = exactMatch.collateralToken) !== null && _c !== void 0 ? _c : 'USDC',
-                marketPrefix: (_d = exactMatch.marketPrefix) !== null && _d !== void 0 ? _d : null,
-            };
-        }
-    }
-    if (knownPrefix) {
-        const exactMatch = perpMetaAssets.find((a) => {
-            var _a;
-            return a.name === assetName &&
-                ((_a = a.marketPrefix) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === knownPrefix.toLowerCase();
-        });
-        if (exactMatch) {
-            return {
-                collateralToken: (_e = exactMatch.collateralToken) !== null && _e !== void 0 ? _e : 'USDC',
-                marketPrefix: (_f = exactMatch.marketPrefix) !== null && _f !== void 0 ? _f : null,
-            };
-        }
-    }
-    const regularAsset = perpMetaAssets.find((a) => a.name === assetName && !a.marketPrefix);
-    if (regularAsset) {
-        return {
-            collateralToken: (_g = regularAsset.collateralToken) !== null && _g !== void 0 ? _g : 'USDC',
-            marketPrefix: null,
-        };
-    }
-    const hip3Assets = perpMetaAssets.filter((a) => a.name === assetName && a.marketPrefix);
-    if (hip3Assets.length > 0) {
-        if (desiredCollateral) {
-            const collateralMatch = hip3Assets.find((a) => a.collateralToken === desiredCollateral);
-            if (collateralMatch) {
-                return {
-                    collateralToken: (_h = collateralMatch.collateralToken) !== null && _h !== void 0 ? _h : 'USDC',
-                    marketPrefix: (_j = collateralMatch.marketPrefix) !== null && _j !== void 0 ? _j : null,
-                };
-            }
-        }
-        const usdHMatch = hip3Assets.find((a) => a.collateralToken === 'USDH');
-        const chosen = usdHMatch !== null && usdHMatch !== void 0 ? usdHMatch : hip3Assets[0];
-        return {
-            collateralToken: (_k = chosen.collateralToken) !== null && _k !== void 0 ? _k : 'USDC',
-            marketPrefix: (_l = chosen.marketPrefix) !== null && _l !== void 0 ? _l : null,
-        };
-    }
-    return { collateralToken: 'USDC', marketPrefix: null };
-}
-function enrichOrderAssets(assets, perpMetaAssets) {
-    if (!assets)
-        return [];
-    return assets.map((asset) => {
-        var _a;
-        if (asset.marketPrefix && asset.collateralToken) {
-            return asset;
-        }
-        const meta = findAssetMeta$1(asset.asset, perpMetaAssets, asset.marketPrefix, asset.collateralToken);
-        return {
-            ...asset,
-            marketPrefix: asset.marketPrefix || meta.marketPrefix,
-            collateralToken: (_a = asset.collateralToken) !== null && _a !== void 0 ? _a : meta.collateralToken,
-        };
-    });
-}
-function enrichTwapOrders(orders, perpMetaAssets) {
-    return orders.map((order) => ({
-        ...order,
-        longAssets: enrichOrderAssets(order.longAssets, perpMetaAssets),
-        shortAssets: enrichOrderAssets(order.shortAssets, perpMetaAssets),
-    }));
-}
 function useTwap() {
     const twapDetails = useUserData((state) => state.twapDetails);
-    const allPerpMetaAssets = useHyperliquidData((state) => state.allPerpMetaAssets);
     const context = useContext(PearHyperliquidContext);
     if (!context)
         throw new Error('useTwap must be used within a PearHyperliquidProvider');
     const { apiBaseUrl } = context;
+    const { getAssetByName } = useMarket();
     const orders = useMemo(() => {
-        const rawOrders = twapDetails !== null && twapDetails !== void 0 ? twapDetails : [];
-        return enrichTwapOrders(rawOrders, allPerpMetaAssets);
-    }, [twapDetails, allPerpMetaAssets]);
+        const mapAssets = (assets) => assets.map((asset) => ({
+            ...asset,
+            metadata: getAssetByName(asset.asset),
+        }));
+        return (twapDetails !== null && twapDetails !== void 0 ? twapDetails : []).map((order) => {
+            var _a, _b;
+            return ({
+                ...order,
+                longAssets: mapAssets((_a = order.longAssets) !== null && _a !== void 0 ? _a : []),
+                shortAssets: mapAssets((_b = order.shortAssets) !== null && _b !== void 0 ? _b : []),
+            });
+        });
+    }, [twapDetails, getAssetByName]);
     const cancelTwap$1 = async (orderId) => {
         return cancelTwap(apiBaseUrl, orderId);
     };
@@ -7690,62 +7172,29 @@ function useNotifications() {
     };
 }
 
-// Helper to find asset metadata from perpMetaAssets
-function findAssetMeta(assetName, perpMetaAssets) {
-    var _a, _b, _c, _d;
-    if (!perpMetaAssets) {
-        return { collateralToken: 'USDC', marketPrefix: null };
-    }
-    // Try exact match first (for prefixed assets like "xyz:TSLA")
-    const exactMatch = perpMetaAssets.find((a) => a.name === assetName);
-    if (exactMatch) {
-        return {
-            collateralToken: (_a = exactMatch.collateralToken) !== null && _a !== void 0 ? _a : 'USDC',
-            marketPrefix: (_b = exactMatch.marketPrefix) !== null && _b !== void 0 ? _b : null,
-        };
-    }
-    // Try matching by base symbol (for non-prefixed names in data)
-    const baseMatch = perpMetaAssets.find((a) => {
-        const baseName = a.name.includes(':') ? a.name.split(':')[1] : a.name;
-        return baseName === assetName;
-    });
-    if (baseMatch) {
-        return {
-            collateralToken: (_c = baseMatch.collateralToken) !== null && _c !== void 0 ? _c : 'USDC',
-            marketPrefix: (_d = baseMatch.marketPrefix) !== null && _d !== void 0 ? _d : null,
-        };
-    }
-    return { collateralToken: 'USDC', marketPrefix: null };
-}
-// Enrich a single asset with metadata
-function enrichAsset(asset, perpMetaAssets) {
-    const meta = findAssetMeta(asset.asset, perpMetaAssets);
-    return {
-        ...asset,
-        collateralToken: meta.collateralToken,
-        marketPrefix: meta.marketPrefix,
-    };
-}
-// Enrich a basket item with collateral info
-function enrichBasketItem(item, perpMetaAssets) {
-    const enrichedLongs = item.longAssets.map((a) => enrichAsset(a, perpMetaAssets));
-    const enrichedShorts = item.shortAssets.map((a) => enrichAsset(a, perpMetaAssets));
-    // Determine collateral type
-    const allAssets = [...enrichedLongs, ...enrichedShorts];
-    const hasUsdc = allAssets.some((a) => a.collateralToken === 'USDC');
-    const hasUsdh = allAssets.some((a) => a.collateralToken === 'USDH');
-    let collateralType = 'USDC';
-    if (hasUsdc && hasUsdh) {
-        collateralType = 'MIXED';
-    }
-    else if (hasUsdh) {
-        collateralType = 'USDH';
-    }
+// Convert a basket item to the expected type
+function enrichBasketItem(item) {
+    const enrichedLongs = item.longAssets.map((a) => ({
+        ...a,
+    }));
+    const enrichedShorts = item.shortAssets.map((a) => ({
+        ...a,
+    }));
+    // // Determine collateral type
+    // const allAssets = [...enrichedLongs, ...enrichedShorts];
+    // const hasUsdc = allAssets.some((a) => a.collateralToken === 'USDC');
+    // const hasUsdh = allAssets.some((a) => a.collateralToken === 'USDH');
+    // let collateralType: 'USDC' | 'USDH' | 'MIXED' = 'USDC';
+    // if (hasUsdc && hasUsdh) {
+    //   collateralType = 'MIXED';
+    // } else if (hasUsdh) {
+    //   collateralType = 'USDH';
+    // }
     return {
         ...item,
         longAssets: enrichedLongs,
         shortAssets: enrichedShorts,
-        collateralType,
+        collateralType: 'USDC', //TODO: change
     };
 }
 /**
@@ -7774,86 +7223,61 @@ function filterByCollateral(baskets, filter) {
 const useMarketDataPayload = () => {
     return useMarketData((s) => s.marketData);
 };
-// Full payload for 'market-data-all' channel (raw from WS)
-const useMarketDataAllPayload = () => {
-    return useMarketData((s) => s.marketDataAll);
-};
-// Access perpMetaAssets for enrichment
-const usePerpMetaAssets = () => {
-    return useHyperliquidData((s) => s.perpMetaAssets);
-};
-// Active baskets (with collateral and market prefix info)
+// Active baskets
 const useActiveBaskets = (collateralFilter) => {
     const data = useMarketDataPayload();
-    const perpMetaAssets = usePerpMetaAssets();
     return useMemo(() => {
         if (!(data === null || data === void 0 ? void 0 : data.active))
             return [];
-        const enriched = data.active.map((item) => enrichBasketItem(item, perpMetaAssets));
+        const enriched = data.active.map((item) => enrichBasketItem(item));
         return filterByCollateral(enriched, collateralFilter);
-    }, [data, perpMetaAssets, collateralFilter]);
+    }, [data, collateralFilter]);
 };
-// Top gainers (with collateral and market prefix info)
+// Top gainers
 const useTopGainers = (limit, collateralFilter) => {
     const data = useMarketDataPayload();
-    const perpMetaAssets = usePerpMetaAssets();
     return useMemo(() => {
         var _a;
         const list = (_a = data === null || data === void 0 ? void 0 : data.topGainers) !== null && _a !== void 0 ? _a : [];
         const limited = typeof limit === 'number' ? list.slice(0, Math.max(0, limit)) : list;
-        const enriched = limited.map((item) => enrichBasketItem(item, perpMetaAssets));
+        const enriched = limited.map((item) => enrichBasketItem(item));
         return filterByCollateral(enriched, collateralFilter);
-    }, [data, perpMetaAssets, limit, collateralFilter]);
+    }, [data, limit, collateralFilter]);
 };
-// Top losers (with collateral and market prefix info)
+// Top losers
 const useTopLosers = (limit, collateralFilter) => {
     const data = useMarketDataPayload();
-    const perpMetaAssets = usePerpMetaAssets();
     return useMemo(() => {
         var _a;
         const list = (_a = data === null || data === void 0 ? void 0 : data.topLosers) !== null && _a !== void 0 ? _a : [];
         const limited = typeof limit === 'number' ? list.slice(0, Math.max(0, limit)) : list;
-        const enriched = limited.map((item) => enrichBasketItem(item, perpMetaAssets));
+        const enriched = limited.map((item) => enrichBasketItem(item));
         return filterByCollateral(enriched, collateralFilter);
-    }, [data, perpMetaAssets, limit, collateralFilter]);
+    }, [data, limit, collateralFilter]);
 };
-// Highlighted baskets (with collateral and market prefix info)
+// Highlighted baskets
 const useHighlightedBaskets = (collateralFilter) => {
     const data = useMarketDataPayload();
-    const perpMetaAssets = usePerpMetaAssets();
     return useMemo(() => {
         if (!(data === null || data === void 0 ? void 0 : data.highlighted))
             return [];
-        const enriched = data.highlighted.map((item) => enrichBasketItem(item, perpMetaAssets));
+        const enriched = data.highlighted.map((item) => enrichBasketItem(item));
         return filterByCollateral(enriched, collateralFilter);
-    }, [data, perpMetaAssets, collateralFilter]);
+    }, [data, collateralFilter]);
 };
-// Watchlist baskets (with collateral and market prefix info)
+// Watchlist baskets
 const useWatchlistBaskets = (collateralFilter) => {
     const data = useMarketDataPayload();
-    const perpMetaAssets = usePerpMetaAssets();
     return useMemo(() => {
         if (!(data === null || data === void 0 ? void 0 : data.watchlist))
             return [];
-        const enriched = data.watchlist.map((item) => enrichBasketItem(item, perpMetaAssets));
-        return filterByCollateral(enriched, collateralFilter);
-    }, [data, perpMetaAssets, collateralFilter]);
-};
-// All baskets (with collateral and market prefix info)
-const useAllBaskets = (collateralFilter) => {
-    const dataAll = useMarketDataAllPayload();
-    const perpMetaAssets = usePerpMetaAssets();
-    return useMemo(() => {
-        if (!(dataAll === null || dataAll === void 0 ? void 0 : dataAll.all))
-            return [];
-        const enriched = dataAll.all.map((item) => enrichBasketItem(item, perpMetaAssets));
+        const enriched = data.watchlist.map((item) => enrichBasketItem(item));
         return filterByCollateral(enriched, collateralFilter);
-    }, [dataAll, perpMetaAssets, collateralFilter]);
+    }, [data, collateralFilter]);
 };
 // Find a basket by its exact asset composition (order-insensitive)
 const useFindBasket = (longs, shorts) => {
     const data = useMarketDataPayload();
-    const perpMetaAssets = usePerpMetaAssets();
     return useMemo(() => {
         if (!data)
             return undefined;
@@ -7871,18 +7295,17 @@ const useFindBasket = (longs, shorts) => {
             normalize(item.shortAssets) === sKey;
         const found = data.active.find(match) || data.highlighted.find(match);
         return found
-            ? enrichBasketItem(found, perpMetaAssets)
+            ? enrichBasketItem(found)
             : undefined;
-    }, [data, longs, shorts, perpMetaAssets]);
+    }, [data, longs, shorts]);
 };
 
-async function toggleWatchlist(baseUrl, longAssets, shortAssets, hip3Assets) {
+async function toggleWatchlist(baseUrl, longAssets, shortAssets) {
     const url = joinUrl(baseUrl, '/watchlist');
-    const mapAssets = (arr) => arr.map((a) => ({ ...a, asset: toBackendSymbol(a.asset, hip3Assets) }));
     try {
         const response = await apiClient.post(url, {
-            longAssets: mapAssets(longAssets),
-            shortAssets: mapAssets(shortAssets),
+            longAssets,
+            shortAssets,
         }, { headers: { 'Content-Type': 'application/json' } });
         return {
             data: response.data,
@@ -7900,11 +7323,10 @@ function useWatchlist() {
     if (!context)
         throw new Error('useWatchlist must be used within a PearHyperliquidProvider');
     const { apiBaseUrl, isConnected } = context;
-    const hip3Assets = useHyperliquidData((s) => s.hip3Assets);
     const marketData = useMarketDataPayload();
     const isLoading = useMemo(() => !marketData && isConnected, [marketData, isConnected]);
     const toggle = async (longAssets, shortAssets) => {
-        const resp = await toggleWatchlist(apiBaseUrl, longAssets, shortAssets, hip3Assets);
+        const resp = await toggleWatchlist(apiBaseUrl, longAssets, shortAssets);
         // Server will push updated market-data over WS; nothing to set here
         return resp;
     };
@@ -8162,7 +7584,6 @@ const useAllUserBalances = () => {
     const spotState = useUserData((state) => state.spotState);
     const aggregatedClearingHouseState = useHyperliquidData((state) => state.aggregatedClearingHouseState);
     const rawClearinghouseStates = useHyperliquidData((state) => state.rawClearinghouseStates);
-    const activeAssetData = useHyperliquidData((state) => state.activeAssetData);
     const { longTokensMetadata, shortTokensMetadata } = useTokenSelectionMetadata();
     return useMemo(() => {
         const isLoading = !spotState || !aggregatedClearingHouseState;
@@ -8185,39 +7606,50 @@ const useAllUserBalances = () => {
                 }
             }
         }
+        // Get available to trade from tokenMetadata for both USDC and USDH markets
+        let availableToTradeUsdcFromAsset = 0;
         let availableToTradeUsdhFromAsset = 0;
-        // This activeAssetData only contains data for SELECTED tokens (user's long and short Tokens)
+        // Token metadata only contains availableToTrade for SELECTED tokens (user's long and short Tokens)
         // It does NOT contain data for all tokens, so we cannot reliably use it for available to trade as used on hl trade page
         // so intead, we rely on rawClearinghouseStates which provides market-specific data
-        // if (activeAssetData) {
-        //   Object.values(activeAssetData).forEach((assetData) => {
-        //     if (!assetData.availableToTrade) return;
-        //     const coinSymbol = assetData.coin;
-        //     const availableValue = truncateToTwoDecimals(
-        //       parseFloat(assetData.availableToTrade[0] || '0'),
-        //     );
-        //     // Determine collateral type based on market prefix
-        //     // HIP3 markets have prefix: "xyz:SYMBOL", "flx:SYMBOL", "vntl:SYMBOL", etc.
-        //     if (coinSymbol.includes(':')) {
-        //       const prefix = coinSymbol.split(':')[0];
-        //       if (prefix === 'xyz') {
-        //         // xyz markets use USDC
-        //         availableToTradeUsdcFromAsset = availableValue;
-        //       } else {
-        //         // flx, vntl, hyna and other markets use USDH
-        //         availableToTradeUsdhFromAsset = availableValue;
-        //       }
-        //     } else {
-        //       // Regular markets without prefix are automatically USDC
-        //       availableToTradeUsdcFromAsset = availableValue;
-        //     }
-        //   });
-        // }
+        const selectedMetadataEntries = [
+            ...Object.entries(longTokensMetadata),
+            ...Object.entries(shortTokensMetadata),
+        ];
+        selectedMetadataEntries.forEach(([symbol, metadata]) => {
+            var _a;
+            const availableStr = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.availableToTrade) === null || _a === void 0 ? void 0 : _a[0];
+            if (!availableStr)
+                return;
+            const availableValue = truncateToTwoDecimals(parseFloat(availableStr || '0'));
+            if ((metadata === null || metadata === void 0 ? void 0 : metadata.collateralToken) === 'USDH') {
+                availableToTradeUsdhFromAsset = Math.max(availableToTradeUsdhFromAsset, availableValue);
+                return;
+            }
+            if ((metadata === null || metadata === void 0 ? void 0 : metadata.collateralToken) === 'USDC') {
+                availableToTradeUsdcFromAsset = Math.max(availableToTradeUsdcFromAsset, availableValue);
+                return;
+            }
+            if (symbol.includes(':')) {
+                const prefix = symbol.split(':')[0];
+                if (prefix === 'xyz') {
+                    availableToTradeUsdcFromAsset = Math.max(availableToTradeUsdcFromAsset, availableValue);
+                }
+                else {
+                    availableToTradeUsdhFromAsset = Math.max(availableToTradeUsdhFromAsset, availableValue);
+                }
+                return;
+            }
+            availableToTradeUsdcFromAsset = Math.max(availableToTradeUsdcFromAsset, availableValue);
+        });
         // Calculate USDC available to trade
         // Priority 1: Use value from activeAssetData if available (> 0)
         // Priority 2: Calculate from USDC-specific clearinghouseState (empty prefix)
         let availableToTradeUsdcValue = undefined;
-        if (rawClearinghouseStates) {
+        if (availableToTradeUsdcFromAsset > 0) {
+            availableToTradeUsdcValue = availableToTradeUsdcFromAsset;
+        }
+        else if (rawClearinghouseStates) {
             // Find USDC market (empty prefix)
             const usdcMarket = rawClearinghouseStates.find(([prefix]) => prefix === '');
             const usdcState = usdcMarket === null || usdcMarket === void 0 ? void 0 : usdcMarket[1];
@@ -8245,7 +7677,6 @@ const useAllUserBalances = () => {
         spotState,
         aggregatedClearingHouseState,
         rawClearinghouseStates,
-        activeAssetData,
         longTokensMetadata,
         shortTokensMetadata,
     ]);
@@ -8347,7 +7778,7 @@ function useHyperliquidUserFills(options) {
         if (!userState.accountSummary)
             return;
         const clearinghouseState = useHyperliquidData.getState().aggregatedClearingHouseState;
-        if (!(clearinghouseState === null || clearinghouseState === void 0 ? void 0 : clearinghouseState.assetPositions))
+        if (!clearinghouseState)
             return;
         setIsSyncing(true);
         setError(null);
@@ -8392,9 +7823,6 @@ const PearHyperliquidProvider = ({ children, apiBaseUrl = 'https://hl-ui.pearpro
     const setAddress = useUserData((s) => s.setAddress);
     const perpsMetaAssets = useHyperliquidData((state) => state.perpMetaAssets);
     const setPerpMetaAssets = useHyperliquidData((state) => state.setPerpMetaAssets);
-    const setAllPerpMetaAssets = useHyperliquidData((state) => state.setAllPerpMetaAssets);
-    const setHip3Assets = useHyperliquidData((state) => state.setHip3Assets);
-    const setHip3MarketPrefixes = useHyperliquidData((state) => state.setHip3MarketPrefixes);
     const websocketsEnabled = useMemo(() => Array.isArray(perpsMetaAssets) && perpsMetaAssets.length > 0, [perpsMetaAssets]);
     const { handleUserFillsEvent } = useHyperliquidUserFills({
         baseUrl: apiBaseUrl,
@@ -8415,106 +7843,34 @@ const PearHyperliquidProvider = ({ children, apiBaseUrl = 'https://hl-ui.pearpro
         if (perpsMetaAssets === null) {
             fetchAllPerpMetas()
                 .then((res) => {
-                const assetToMarkets = new Map();
-                const marketPrefixes = new Map();
-                const FILTERED_PREFIXES = ['hyna'];
-                // Group assets by market prefix to match WebSocket flattening order
-                // WebSocket sends in order: "", "flx", "hyna", "vntl", "xyz" (we filter out hyna)
-                const assetsByPrefix = new Map();
-                const allAssetsByPrefix = new Map();
+                const allPerpMetas = [];
                 res.data.forEach((item) => {
-                    const collateralToken = item.collateralToken === 360 ? 'USDH' : 'USDC';
+                    // Only include USDC and USDH collateral tokens
+                    if (item.collateralToken !== 360 && item.collateralToken !== 0) {
+                        return;
+                    }
+                    var collateralToken;
+                    if (item.collateralToken === 360) {
+                        collateralToken = 'USDH';
+                    }
+                    if (item.collateralToken === 0) {
+                        collateralToken = 'USDC';
+                    }
                     item.universe.forEach((asset) => {
-                        var _a;
-                        const [maybePrefix, maybeMarket] = asset.name.split(':');
-                        if (maybeMarket) {
-                            // HIP3 asset with market prefix
-                            const prefix = maybePrefix.toLowerCase();
-                            const displayName = maybeMarket;
-                            const fullName = `${prefix}:${displayName}`;
-                            marketPrefixes.set(fullName, prefix);
-                            if (!FILTERED_PREFIXES.includes(prefix)) {
-                                const existingMarkets = (_a = assetToMarkets.get(displayName)) !== null && _a !== void 0 ? _a : [];
-                                if (!existingMarkets.includes(fullName)) {
-                                    assetToMarkets.set(displayName, [
-                                        ...existingMarkets,
-                                        fullName,
-                                    ]);
-                                }
-                            }
-                            const assetWithMeta = {
-                                ...asset,
-                                name: displayName,
-                                marketPrefix: prefix,
-                                collateralToken,
-                            };
-                            // Group by market prefix
-                            const allList = allAssetsByPrefix.get(prefix) || [];
-                            allList.push(assetWithMeta);
-                            allAssetsByPrefix.set(prefix, allList);
-                            if (!FILTERED_PREFIXES.includes(prefix)) {
-                                const cleanedList = assetsByPrefix.get(prefix) || [];
-                                cleanedList.push(assetWithMeta);
-                                assetsByPrefix.set(prefix, cleanedList);
-                            }
-                        }
-                        else {
-                            // Default market asset (no prefix)
-                            const assetWithMeta = {
-                                ...asset,
-                                collateralToken,
-                            };
-                            // Add to default market group ("")
-                            const defaultList = assetsByPrefix.get('') || [];
-                            defaultList.push(assetWithMeta);
-                            assetsByPrefix.set('', defaultList);
-                            const allDefaultList = allAssetsByPrefix.get('') || [];
-                            allDefaultList.push(assetWithMeta);
-                            allAssetsByPrefix.set('', allDefaultList);
-                        }
+                        const assetWithMeta = {
+                            ...asset,
+                            collateralToken,
+                        };
+                        allPerpMetas.push(assetWithMeta);
                     });
                 });
-                // Flatten in consistent order: default market first, then HIP3 markets alphabetically
-                // This ensures both REST API and WebSocket data align properly
-                const cleanedPrefixes = Array.from(assetsByPrefix.keys()).sort((a, b) => {
-                    // Empty prefix (default market) always comes first
-                    if (a === '' && b !== '')
-                        return -1;
-                    if (a !== '' && b === '')
-                        return 1;
-                    // HIP3 markets sorted alphabetically
-                    return a.localeCompare(b);
-                });
-                const allPrefixes = Array.from(allAssetsByPrefix.keys()).sort((a, b) => {
-                    if (a === '' && b !== '')
-                        return -1;
-                    if (a !== '' && b === '')
-                        return 1;
-                    return a.localeCompare(b);
-                });
-                const cleanedPerpMetas = [];
-                const allPerpMetas = [];
-                cleanedPrefixes.forEach((prefix) => {
-                    const assets = assetsByPrefix.get(prefix) || [];
-                    cleanedPerpMetas.push(...assets);
-                });
-                allPrefixes.forEach((prefix) => {
-                    const assets = allAssetsByPrefix.get(prefix) || [];
-                    allPerpMetas.push(...assets);
-                });
-                setHip3Assets(assetToMarkets);
-                setHip3MarketPrefixes(marketPrefixes);
-                setPerpMetaAssets(cleanedPerpMetas);
-                setAllPerpMetaAssets(allPerpMetas);
+                setPerpMetaAssets(allPerpMetas);
             })
                 .catch(() => { });
         }
     }, [
         perpsMetaAssets,
         setPerpMetaAssets,
-        setAllPerpMetaAssets,
-        setHip3Assets,
-        setHip3MarketPrefixes,
     ]);
     const contextValue = useMemo(() => ({
         // Config
@@ -8799,4 +8155,4 @@ function getOrderTrailingInfo(order) {
     return undefined;
 }
 
-export { AccountSummaryCalculator, ConflictDetector, MAX_ASSETS_PER_LEG, MINIMUM_ASSET_USD_VALUE, MaxAssetsPerLegError, MinimumPositionSizeError, PearHyperliquidProvider, TokenMetadataExtractor, adjustAdvancePosition, adjustOrder, adjustPosition, calculateMinimumPositionValue, calculateWeightedRatio, cancelOrder, cancelTwap, cancelTwapOrder, closeAllPositions, closePosition, computeBasketCandles, createCandleLookups, createPosition, executeSpotOrder, getAvailableMarkets, getCompleteTimestamps, getKalshiMarkets, getMarketPrefix, getOrderDirection, getOrderLadderConfig, getOrderLeverage, getOrderReduceOnly, getOrderTpSlTriggerType, getOrderTrailingInfo, getOrderTriggerType, getOrderTriggerValue, getOrderTwapDuration, getOrderUsdValue, getPortfolio, isBtcDomOrder, isHip3Market, mapCandleIntervalToTradingViewInterval, mapTradingViewIntervalToCandleInterval, markNotificationReadById, markNotificationsRead, toBackendSymbol, toBackendSymbolWithMarket, toDisplaySymbol, toggleWatchlist, updateLeverage, updateRiskParameters, useAccountSummary, useActiveBaskets, useAgentWallet, useAllBaskets, useAllUserBalances, useAuth, useBasketCandles, useFindBasket, useHighlightedBaskets, useHistoricalPriceData, useHistoricalPriceDataStore, useHyperliquidNativeWebSocket, useHyperliquidUserFills, useHyperliquidWebSocket, useMarketData, useMarketDataAllPayload, useMarketDataPayload, useNotifications, useOpenOrders, useOrders, usePearHyperliquid, usePerformanceOverlays, usePerpMetaAssets, usePortfolio, usePosition, useSpotOrder, useTokenSelectionMetadata, useTopGainers, useTopLosers, useTradeHistories, useTwap, useUserSelection, useWatchlist, useWatchlistBaskets, useWebData, validateMaxAssetsPerLeg, validateMinimumAssetSize, validatePositionSize };
+export { AccountSummaryCalculator, ConflictDetector, MAX_ASSETS_PER_LEG, MINIMUM_ASSET_USD_VALUE, MaxAssetsPerLegError, MinimumPositionSizeError, PearHyperliquidProvider, TokenMetadataExtractor, adjustAdvancePosition, adjustOrder, adjustPosition, calculateMinimumPositionValue, calculateWeightedRatio, cancelOrder, cancelTwap, cancelTwapOrder, closeAllPositions, closePosition, computeBasketCandles, createCandleLookups, createPosition, executeSpotOrder, getAssetByName, getCompleteTimestamps, getKalshiMarkets, getOrderDirection, getOrderLadderConfig, getOrderLeverage, getOrderReduceOnly, getOrderTpSlTriggerType, getOrderTrailingInfo, getOrderTriggerType, getOrderTriggerValue, getOrderTwapDuration, getOrderUsdValue, getPortfolio, isBtcDomOrder, mapCandleIntervalToTradingViewInterval, mapTradingViewIntervalToCandleInterval, markNotificationReadById, markNotificationsRead, selectTokenMetadataBySymbols, toggleWatchlist, updateLeverage, updateRiskParameters, useAccountSummary, useActiveBaskets, useAgentWallet, useAllUserBalances, useAuth, useBasketCandles, useFindBasket, useHighlightedBaskets, useHistoricalPriceData, useHistoricalPriceDataStore, useHyperliquidNativeWebSocket, useHyperliquidUserFills, useHyperliquidWebSocket, useMarket, useMarketData, useMarketDataPayload, useNotifications, useOpenOrders, useOrders, usePearHyperliquid, usePerformanceOverlays, usePortfolio, usePosition, useSpotOrder, useTokenSelectionMetadata, useTopGainers, useTopLosers, useTradeHistories, useTwap, useUserSelection, useWatchlist, useWatchlistBaskets, validateMaxAssetsPerLeg, validateMinimumAssetSize, validatePositionSize };