adapting new collectiblesController shape (#648)

* adapting new collectiblesController shape

* address feedback

src/assets/CollectiblesController.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events';
-import { BN, stripHexPrefix } from 'ethereumjs-util';
+import { BN, stripHexPrefix, isHexString } from 'ethereumjs-util';
 import { Mutex } from 'async-mutex';
+
 import { BaseController, BaseConfig, BaseState } from '../BaseController';
 import type { PreferencesState } from '../user/PreferencesController';
 import type { NetworkState, NetworkType } from '../network/NetworkController';
@@ -492,6 +493,13 @@ export class CollectiblesController extends BaseController<
         selectedAddress = this.config.selectedAddress;
       }
 
+      // ensure that chainid matches dec format for both detection and manual flows
+      if (typeof chainId === 'string' && isHexString(chainId)) {
+        chainId = `${parseInt(chainId, 16)}` as const;
+      } else if (typeof chainId === 'number') {
+        chainId = `${chainId}` as const;
+      }
+
       const collectibles = allCollectibles[selectedAddress]?.[chainId] || [];
 
       const existingEntry: Collectible | undefined = collectibles.find(
@@ -571,6 +579,13 @@ export class CollectiblesController extends BaseController<
         selectedAddress = this.config.selectedAddress;
       }
 
+      // ensure that chainid matches dec format for both detection and manual flows
+      if (typeof chainId === 'string' && isHexString(chainId)) {
+        chainId = `${parseInt(chainId, 16)}` as const;
+      } else if (typeof chainId === 'number') {
+        chainId = `${chainId}` as const;
+      }
+
       const collectibleContracts =
         allCollectibleContracts[selectedAddress]?.[chainId] || [];