@rango-dev/wallets-react 0.47.1-next.4 → 0.47.1-next.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/wallets-react",
-  "version": "0.47.1-next.4",
+  "version": "0.47.1-next.5",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -35,16 +35,16 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@hub3js/core": "^0.61.0",
-    "@hub3js/evm": "^0.3.0",
-    "@hub3js/namespaces": "^0.2.2",
-    "@hub3js/solana": "^0.3.0",
-    "@hub3js/std": "^0.2.0",
-    "@hub3js/sui": "^0.2.0",
-    "@hub3js/tvm": "^0.2.0",
+    "@hub3js/core": "^0.61.1",
+    "@hub3js/evm": "^0.3.3",
+    "@hub3js/namespaces": "^0.2.5",
+    "@hub3js/solana": "^0.3.3",
+    "@hub3js/std": "^0.2.3",
+    "@hub3js/sui": "^0.2.3",
+    "@hub3js/tvm": "^0.2.3",
     "@rango-dev/logging-core": "^0.13.1-next.0",
-    "@rango-dev/wallets-core": "^0.60.1-next.3",
-    "@rango-dev/wallets-shared": "^0.61.1-next.4",
+    "@rango-dev/wallets-core": "^0.60.1-next.4",
+    "@rango-dev/wallets-shared": "^0.61.1-next.5",
     "caip": "^1.1.1",
     "rango-types": "^0.5.0",
     "ts-results": "^3.3.0"

package/src/hub/useHubAdapter.ts

@@ -6,7 +6,12 @@ import type { Accounts, AccountsWithActiveChain } from '@hub3js/std/types';
 import type { LegacyNamespaceInputForConnect } from '@rango-dev/wallets-core/legacy';
 
 import { utils } from '@hub3js/evm';
-import { type WalletInfo, type WalletType } from '@rango-dev/wallets-shared';
+import {
+  getSupportedChainsFromNamespace,
+  getSupportedChainsFromProvider,
+  type WalletInfo,
+  type WalletType,
+} from '@rango-dev/wallets-shared';
 import { useEffect, useRef, useState } from 'react';
 import { Ok, Result } from 'ts-results';
 
@@ -22,7 +27,6 @@ import { createQueue, fromAccountIdToLegacyAddressFormat } from './helpers.js';
 import { LastConnectedWalletsFromStorage } from './lastConnectedWallets.js';
 import { useHubRefs } from './useHubRefs.js';
 import {
-  getSupportedChainsFromProvider,
   isEvmNamespace,
   isSolanaNamespace,
   isUtxoNamespace,
@@ -182,21 +186,25 @@ export function useHubAdapter(params: UseAdapterParams): ProviderContext {
       if (!dataRef.current.allBlockChains) {
         throw new Error(`Blockchains are not available`);
       }
-      const providerSupportedChainsOfNamespace = namespacesProperty?.value.data
-        .find(
-          (providerNamespace) => providerNamespace.value === namespace.namespace
-        )
-        ?.getSupportedChains(dataRef.current.allBlockChains);
 
-      if (!providerSupportedChainsOfNamespace) {
+      const namespaceMeta = namespacesProperty?.value.data.find(
+        (providerNamespace) => providerNamespace.value === namespace.namespace
+      );
+
+      if (!namespaceMeta) {
         throw new Error(
           `NamespaceMeta is not defined for requested namespace: ${namespace.namespace}`
         );
       }
 
+      const supportedChains = getSupportedChainsFromNamespace(
+        namespaceMeta,
+        dataRef.current.allBlockChains
+      );
+
       return proxiedNamespace.canSwitchNetwork({
         network,
-        supportedChains: providerSupportedChainsOfNamespace,
+        supportedChains,
       });
     },
     async connect(type, namespaces) {

package/src/hub/utils.ts

@@ -20,6 +20,7 @@ import {
   type AddEthereumChainParameter,
   convertEvmBlockchainMetaToEvmChainInfo,
   getBlockChainNameFromId,
+  getSupportedChainsFromProvider,
   type WalletType,
 } from '@rango-dev/wallets-shared';
 import { AccountId } from 'caip';
@@ -77,22 +78,6 @@ const lastConnectedWalletsFromStorage = new LastConnectedWalletsFromStorage(
   HUB_LAST_CONNECTED_WALLETS
 );
 
-export function getSupportedChainsFromProvider(
-  provider: Provider,
-  allBlockChains: ProviderProps['allBlockChains']
-) {
-  const namespacesProperty = provider
-    .info()
-    ?.metadata.properties?.find((property) => property.name === 'namespaces');
-
-  const supportedChains =
-    namespacesProperty?.value.data.flatMap((namespace) =>
-      namespace.getSupportedChains(allBlockChains || [])
-    ) || [];
-
-  return supportedChains;
-}
-
 export function mapHubEventsToLegacy(
   hub: Hub,
   event: Event,