fixes

Author: bergarces

packages/assets-controllers/src/TokenRatesController.ts

@@ -703,12 +703,11 @@ export class TokenRatesController extends StaticIntervalPollingController<TokenR
     chainId: Hex;
     nativeCurrency: string;
   }): Promise<ContractMarketData> {
-    let contractNativeInformations;
     const tokenPricesByTokenAddress = await reduceInBatchesSerially<
       Hex,
       Record<Hex, EvmAssetWithMarketData>
     >({
-      values: [...tokenAddresses].sort(),
+      values: [...tokenAddresses, getNativeTokenAddress(chainId)].sort(),
       batchSize: TOKEN_PRICES_BATCH_SIZE,
       eachBatch: async (allTokenPricesByTokenAddress, batch) => {
         const tokenPricesByTokenAddressForBatch = (
@@ -734,26 +733,26 @@ export class TokenRatesController extends StaticIntervalPollingController<TokenR
       },
       initialResult: {},
     });
-    contractNativeInformations = tokenPricesByTokenAddress;
+    // const contractNativeInformations = tokenPricesByTokenAddress;
 
     // fetch for native token
-    if (tokenAddresses.length === 0) {
-      const contractNativeInformationNative =
-        await this.#tokenPricesService.fetchTokenPrices({
-          assets: [
-            {
-              chainId,
-              address: getNativeTokenAddress(chainId),
-            },
-          ],
-          currency: nativeCurrency,
-        });
-
-      contractNativeInformations = {
-        [getNativeTokenAddress(chainId)]: contractNativeInformationNative[0],
-      };
-    }
-    return Object.entries(contractNativeInformations).reduce(
+    // if (tokenAddresses.length === 0) {
+    //   const contractNativeInformationNative =
+    //     await this.#tokenPricesService.fetchTokenPrices({
+    //       assets: [
+    //         {
+    //           chainId,
+    //           address: getNativeTokenAddress(chainId),
+    //         },
+    //       ],
+    //       currency: nativeCurrency,
+    //     });
+
+    //   contractNativeInformations = {
+    //     [getNativeTokenAddress(chainId)]: contractNativeInformationNative[0],
+    //   };
+    // }
+    return Object.entries(tokenPricesByTokenAddress).reduce(
       (obj, [tokenAddress, token]) => {
         obj = {
           ...obj,

packages/assets-controllers/src/token-prices-service/codefi-v2.ts

@@ -468,7 +468,7 @@ export class CodefiTokenPricesServiceV2
           assetId:
             nativeAddress.toLowerCase() === asset.address.toLowerCase()
               ? HEX_CHAIN_ID_TO_CAIP19_NATIVE_ASSET_MAP[asset.chainId]
-              : `${caipChainId}/erc20:${asset.address}`,
+              : `${caipChainId}/erc20:${asset.address.toLowerCase()}`,
           address: asset.address,
           chainId: asset.chainId,
         };