fix: EVM exchange rates

Author: micaelae

shared/modules/bridge-utils/caip-formatters.ts

@@ -6,12 +6,15 @@ import {
   toCaipChainId,
   KnownCaipNamespace,
   hexToBigInt,
+  parseCaipChainId,
+  isCaipReference,
 } from '@metamask/utils';
 import { zeroAddress, toChecksumAddress } from 'ethereumjs-util';
 import { MultichainNetworks } from '../../constants/multichain/networks';
 import { ChainId } from '../../types/bridge';
-import { hexToDecimal } from '../conversion.utils';
+import { decimalToPrefixedHex, hexToDecimal } from '../conversion.utils';
 import { MULTICHAIN_NATIVE_CURRENCY_TO_CAIP19 } from '../../constants/multichain/assets';
+import { isValidNumber } from './validators';
 
 // Converts a chainId to a CaipChainId
 export const normalizeChainId = (
@@ -31,6 +34,7 @@ export const normalizeChainId = (
   }
   return toCaipChainId(KnownCaipNamespace.Eip155, chainIdString);
 };
+
 export const formatChainIdToDec = (chainId: number | Hex | CaipChainId) => {
   if (isStrictHexString(chainId)) {
     return Number(hexToDecimal(chainId));
@@ -45,6 +49,19 @@ export const formatChainIdToDec = (chainId: number | Hex | CaipChainId) => {
   return chainId;
 };
 
+export const formatChainIdToHex = (chainId: number | Hex | CaipChainId) => {
+  if (isStrictHexString(chainId)) {
+    return chainId;
+  }
+  if (isCaipChainId(chainId)) {
+    const { reference } = parseCaipChainId(chainId);
+    if (isCaipReference(reference) && isValidNumber(reference)) {
+      return decimalToPrefixedHex(reference);
+    }
+  }
+  return undefined;
+};
+
 export const formatAddressToString = (address?: string) => {
   if (!address) {
     return undefined;

ui/ducks/bridge/utils.ts

@@ -1,4 +1,4 @@
-import { isStrictHexString, type Hex } from '@metamask/utils';
+import { type CaipChainId, isStrictHexString, type Hex } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
 import type { ContractMarketData } from '@metamask/assets-controllers';
 import {
@@ -8,9 +8,11 @@ import {
 import { toChecksumAddress } from 'ethereumjs-util';
 import { decGWEIToHexWEI } from '../../../shared/modules/conversion.utils';
 import { Numeric } from '../../../shared/modules/Numeric';
-import { type TxData } from '../../../shared/types/bridge';
+import { ChainId, type TxData } from '../../../shared/types/bridge';
 import { getTransaction1559GasFeeEstimates } from '../../pages/swaps/swaps.util';
 import { fetchTokenExchangeRates as fetchTokenExchangeRatesUtil } from '../../helpers/utils/util';
+import { formatChainIdToHex } from '../../../shared/modules/bridge-utils/caip-formatters';
+import { MultichainNetworks } from '../../../shared/constants/multichain/networks';
 
 type GasFeeEstimate = {
   suggestedMaxPriorityFeePerGas: string;
@@ -73,14 +75,19 @@ export const getTxGasEstimates = async ({
 };
 
 const fetchTokenExchangeRates = async (
-  chainId: string,
+  chainId: Hex | CaipChainId | ChainId,
   currency: string,
   ...tokenAddresses: string[]
 ) => {
+  // TODO fetch exchange rates for solana
+  if (chainId === MultichainNetworks.SOLANA) {
+    return {};
+  }
+
   const exchangeRates = await fetchTokenExchangeRatesUtil(
     currency,
     tokenAddresses,
-    chainId,
+    formatChainIdToHex(chainId),
   );
   return Object.keys(exchangeRates).reduce(
     (acc: Record<string, number | undefined>, address) => {
@@ -95,7 +102,7 @@ const fetchTokenExchangeRates = async (
 // rate is not available in the TokenRatesController, which happens when the selected token has not been
 // imported into the wallet
 export const getTokenExchangeRate = async (request: {
-  chainId: Hex;
+  chainId: Hex | CaipChainId | ChainId;
   tokenAddress: string;
   currency: string;
 }) => {
@@ -115,11 +122,12 @@ export const getTokenExchangeRate = async (request: {
 // This extracts a token's exchange rate from the marketData state object
 // These exchange rates are against the native asset of the chain
 export const exchangeRateFromMarketData = (
-  chainId: string,
+  chainId: Hex | ChainId,
   tokenAddress: string,
   marketData?: Record<string, ContractMarketData>,
+  // TODO get market data for solana
 ) =>
-  isStrictHexString(tokenAddress)
+  isStrictHexString(tokenAddress) && isStrictHexString(chainId)
     ? marketData?.[chainId]?.[tokenAddress]?.price
     : undefined;
 

ui/hooks/bridge/useBridgeExchangeRates.ts

@@ -7,7 +7,6 @@ import {
 } from '../../ducks/bridge/selectors';
 import { getMarketData, getParticipateInMetaMetrics } from '../../selectors';
 import { getCurrentCurrency } from '../../ducks/metamask/metamask';
-import { decimalToPrefixedHex } from '../../../shared/modules/conversion.utils';
 import { getCurrentChainId } from '../../../shared/modules/selectors/networks';
 import {
   setDestTokenExchangeRates,
@@ -34,11 +33,9 @@ export const useBridgeExchangeRates = () => {
   const toTokenAddress = activeQuote
     ? activeQuote.quote.destAsset.address
     : destTokenAddress;
-  const fromChainId = activeQuote
-    ? decimalToPrefixedHex(activeQuote.quote.srcChainId)
-    : chainId;
+  const fromChainId = activeQuote ? activeQuote.quote.srcChainId : chainId;
   const toChainId = activeQuote
-    ? decimalToPrefixedHex(activeQuote.quote.destChainId)
+    ? activeQuote.quote.destChainId
     : toChain?.chainId;
 
   const marketData = useSelector(getMarketData);