Fixed regression - CAT names no longer show on offer overview or details screens (#2802)

* CHIA-3829: Fixed unknown CAT issue

* Fixed APIs affected by 2.5.7 breaking changes

* Fixed a missing prop

Author: ChiaMineJP

packages/api-react/src/services/wallet.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign -- This file use Immer */
-import { CAT, DID, Farmer, NFT, Pool, WalletService, WalletType, toBech32m, VC } from '@chia-network/api';
+import { CAT, DID, Farmer, NFT, Pool, WalletService, WalletType, toBech32m, VC, normalizeHex } from '@chia-network/api';
 import type { NFTInfo, Transaction, Wallet, WalletBalance } from '@chia-network/api';
 import BigNumber from 'bignumber.js';
 
@@ -91,7 +91,7 @@ export const walletApi = apiWithTag.injectEndpoints({
                   throw assetError as Error;
                 }
 
-                meta.assetId = assetData.assetId;
+                meta.assetId = normalizeHex(assetData.assetId);
 
                 // get CAT name
                 const { data: nameData, error: nameError } = await fetchWithBQ({
@@ -120,8 +120,12 @@ export const walletApi = apiWithTag.injectEndpoints({
                 meta.did = didData.didId;
               }
 
+              // Normalize authorizedProviders for CRCAT wallets (bytes32 now has 0x prefix in 2.5.7+)
+              const normalizedAuthorizedProviders = wallet.authorizedProviders?.map(normalizeHex);
+
               return {
                 ...wallet,
+                ...(normalizedAuthorizedProviders && { authorizedProviders: normalizedAuthorizedProviders }),
                 meta,
               };
             }),
@@ -228,14 +232,15 @@ export const walletApi = apiWithTag.injectEndpoints({
       transformResponse: (response) => {
         const {
           walletBalance,
-          walletBalance: { confirmedWalletBalance, unconfirmedWalletBalance },
+          walletBalance: { confirmedWalletBalance, unconfirmedWalletBalance, assetId },
         } = response;
 
         const pendingBalance = new BigNumber(unconfirmedWalletBalance).minus(confirmedWalletBalance);
         const pendingTotalBalance = new BigNumber(confirmedWalletBalance).plus(pendingBalance);
 
         return {
           ...walletBalance,
+          ...(assetId && { assetId: normalizeHex(assetId) }),
           pendingBalance,
           pendingTotalBalance,
         };
@@ -269,7 +274,21 @@ export const walletApi = apiWithTag.injectEndpoints({
       ]),
     }),
 
-    getWalletBalances: query(build, WalletService, 'getWalletBalances', {}),
+    getWalletBalances: query(build, WalletService, 'getWalletBalances', {
+      transformResponse: (response) => {
+        const { walletBalances } = response;
+        // Normalize assetId in each wallet balance
+        const normalizedBalances: Record<string, WalletBalance> = {};
+        Object.entries(walletBalances).forEach(([walletId, balance]) => {
+          const walletBalance = balance as WalletBalance;
+          normalizedBalances[walletId] = {
+            ...walletBalance,
+            ...(walletBalance.assetId && { assetId: normalizeHex(walletBalance.assetId) }),
+          };
+        });
+        return normalizedBalances;
+      },
+    }),
 
     getFarmedAmount: query(build, WalletService, 'getFarmedAmount', {
       onCacheEntryAdded: onCacheEntryAddedInvalidate(baseQuery, api, [
@@ -654,7 +673,12 @@ export const walletApi = apiWithTag.injectEndpoints({
       invalidatesTags: (_result, _error, { tradeId }) => [{ type: 'OfferTradeRecord', id: tradeId }],
     }),
 
-    checkOfferValidity: mutation(build, WalletService, 'checkOfferValidity'),
+    checkOfferValidity: mutation(build, WalletService, 'checkOfferValidity', {
+      transformResponse: (response) => ({
+        ...response,
+        id: normalizeHex(response.id),
+      }),
+    }),
 
     takeOffer: mutation(build, WalletService, 'takeOffer', {
       invalidatesTags: [{ type: 'OfferTradeRecord', id: 'LIST' }, 'OfferCounts'],
@@ -694,11 +718,15 @@ export const walletApi = apiWithTag.injectEndpoints({
     }),
 
     getCATAssetId: query(build, CAT, 'getAssetId', {
-      transformResponse: (response) => response.assetId,
+      transformResponse: (response) => normalizeHex(response.assetId),
     }),
 
     getCatList: query(build, CAT, 'getCatList', {
-      transformResponse: (response) => response.catList,
+      transformResponse: (response) =>
+        response.catList.map((cat: { assetId: string; name: string; symbol: string }) => ({
+          ...cat,
+          assetId: normalizeHex(cat.assetId),
+        })),
       providesTags(result) {
         return result
           ? [...result.map(({ assetId }) => ({ type: 'CATs', id: assetId }) as const), { type: 'CATs', id: 'LIST' }]
@@ -718,7 +746,14 @@ export const walletApi = apiWithTag.injectEndpoints({
     }),
 
     getStrayCats: query(build, CAT, 'getStrayCats', {
-      transformResponse: (response) => response.strayCats,
+      transformResponse: (response) =>
+        response.strayCats.map(
+          (cat: { assetId: string; name: string; firstSeenHeight: number; senderPuzzleHash: string }) => ({
+            ...cat,
+            assetId: normalizeHex(cat.assetId),
+            senderPuzzleHash: normalizeHex(cat.senderPuzzleHash),
+          }),
+        ),
     }),
 
     // TODO refactor

packages/api/src/@types/WalletBalance.ts

@@ -1,4 +1,5 @@
 type WalletBalance = {
+  assetId?: string;
   confirmedWalletBalance: number;
   fingerprint: number;
   maxSendAmount: number;

packages/api/src/utils/index.ts

@@ -9,3 +9,4 @@ export { default as optionsForPlotter } from './optionsForPlotter';
 export { default as toCamelCase } from './toCamelCase';
 export { default as toSnakeCase } from './toSnakeCase';
 export { default as toBech32m, fromBech32m, decodeBech32m } from './toBech32m';
+export { default as normalizeHex } from './normalizeHex';

packages/api/src/utils/normalizeHex.ts

@@ -0,0 +1,13 @@
+/**
+ * Normalize a hex string by removing the '0x' prefix and converting to lowercase.
+ *
+ * This is needed because chia-blockchain 2.5.7+ returns bytes32 fields with '0x' prefix
+ * via the @marshal decorator, while offer summaries and other parts of the codebase
+ * use hex strings without the prefix.
+ *
+ * @param hex - The hex string to normalize (with or without '0x' prefix)
+ * @returns The normalized hex string (lowercase, no '0x' prefix)
+ */
+export default function normalizeHex(hex: string): string {
+  return hex.toLowerCase().replace(/^0x/, '');
+}

packages/gui/src/hooks/useAssetIdName.ts

@@ -1,4 +1,4 @@
-import { WalletType } from '@chia-network/api';
+import { WalletType, normalizeHex } from '@chia-network/api';
 import { useGetCatListQuery, useGetWalletsQuery } from '@chia-network/api-react';
 import type { CATToken, Wallet } from '@chia-network/core';
 import { useCurrencyCode } from '@chia-network/core';
@@ -44,10 +44,10 @@ export default function useAssetIdName() {
         symbol = currencyCode;
         isVerified = true;
       } else if ([WalletType.CAT, WalletType.RCAT, WalletType.CRCAT].includes(walletType)) {
-        const lowercaseTail = wallet.meta.assetId.toLowerCase();
-        const cat = catList.find((catItem: CATToken) => catItem.assetId.toLowerCase() === lowercaseTail);
+        const normalizedTail = normalizeHex(wallet.meta.assetId);
+        const cat = catList.find((catItem: CATToken) => normalizeHex(catItem.assetId) === normalizedTail);
 
-        assetId = lowercaseTail;
+        assetId = normalizedTail;
         name = wallet.name;
 
         if (cat) {
@@ -73,11 +73,11 @@ export default function useAssetIdName() {
     });
 
     catList.forEach((cat: CATToken) => {
-      if (assetIdNameMapping.has(cat.assetId)) {
+      const normalizedCatAssetId = normalizeHex(cat.assetId);
+      if (assetIdNameMapping.has(normalizedCatAssetId)) {
         return;
       }
 
-      const { assetId } = cat;
       const { name } = cat;
       const { symbol } = cat;
       const displayName = symbol || name;
@@ -88,9 +88,9 @@ export default function useAssetIdName() {
         symbol,
         displayName,
         isVerified: true,
-        assetId,
+        assetId: normalizedCatAssetId,
       };
-      assetIdNameMapping.set(assetId, entry);
+      assetIdNameMapping.set(normalizedCatAssetId, entry);
     });
 
     // If using testnet, add a TXCH assetId entry
@@ -117,7 +117,7 @@ export default function useAssetIdName() {
   ref.current = memoized;
 
   const lookupByAssetId = useCallback(
-    (assetId: string) => ref.current.assetIdNameMapping.get(assetId.toLowerCase()),
+    (assetId: string) => ref.current.assetIdNameMapping.get(normalizeHex(assetId)),
     [ref],
   );