@rango-dev/widget-embedded 0.0.0-experimental-e022ed95-20260421 → 0.0.0-experimental-82bcc5d9-20260608

package/src/hooks/usePrepareBlockchainList/usePrepareBlockchainList.test.ts

@@ -30,69 +30,20 @@ describe('usePrepareBlockchainList', () => {
   });
 
   it('should sort blockchains by user preferences', () => {
-    const preferredBlockchains = ['UMEE', 'BANDCHAIN', 'LINEA'];
+    const preferredBlockchains = ['LINEA', 'BASE'];
     const sortedBlockchainsList = sample.sort(
       generateSortByPreferredBlockchainsFor(preferredBlockchains)
     );
 
     const expected = [
-      'UMEE',
-      'BANDCHAIN',
       'LINEA',
+      'BASE',
       'ETH',
       'BSC',
       'ARBITRUM',
       'POLYGON',
-      'ZKSYNC',
-      'STARKNET',
       'OPTIMISM',
-      'AVAX_CCHAIN',
-      'POLYGONZK',
-      'TRON',
-      'BTC',
-      'COSMOS',
-      'OSMOSIS',
-      'NEUTRON',
-      'NOBLE',
-      'SOLANA',
-      'CRONOS',
-      'BNB',
-      'AURORA',
-      'MAYA',
-      'THOR',
-      'BOBA',
-      'MOONBEAM',
-      'MOONRIVER',
-      'OKC',
-      'BOBA_AVALANCHE',
-      'LTC',
-      'BCH',
-      'HECO',
-      'STARGAZE',
-      'CRYPTO_ORG',
-      'CHIHUAHUA',
-      'COMDEX',
-      'REGEN',
-      'IRIS',
-      'EMONEY',
-      'JUNO',
-      'STRIDE',
-      'MARS',
-      'TERRA',
-      'BITSONG',
-      'AKASH',
-      'KI',
-      'PERSISTENCE',
-      'MEDIBLOC',
-      'KUJIRA',
-      'SENTINEL',
-      'INJECTIVE',
-      'SECRET',
-      'KONSTELLATION',
-      'STARNAME',
-      'BITCANNA',
-      'DESMOS',
-      'LUMNETWORK',
+      'SCROLL',
     ];
     const received = sortedBlockchainsList.map((blockchain) => blockchain.name);
 
@@ -100,66 +51,17 @@ describe('usePrepareBlockchainList', () => {
   });
 
   it('should prepare the list by most used and user preferences', () => {
-    const listLimit = 10;
-    const preferredBlockchains = ['BTC', 'SOLANA', 'COSMOS', 'ETH'];
+    const listLimit = 4;
+    const preferredBlockchains = ['LINEA', 'SCROLL'];
     const expected = [
-      'BTC',
-      'SOLANA',
+      'LINEA',
+      'SCROLL',
       'ETH',
-      'COSMOS',
-      'OSMOSIS',
       'BSC',
       'ARBITRUM',
       'POLYGON',
-      'ZKSYNC',
-      'STARKNET',
       'OPTIMISM',
-      'AVAX_CCHAIN',
-      'POLYGONZK',
-      'LINEA',
-      'TRON',
-      'NEUTRON',
-      'NOBLE',
-      'CRONOS',
-      'BNB',
-      'AURORA',
-      'MAYA',
-      'THOR',
-      'BOBA',
-      'MOONBEAM',
-      'MOONRIVER',
-      'OKC',
-      'BOBA_AVALANCHE',
-      'LTC',
-      'BCH',
-      'HECO',
-      'STARGAZE',
-      'CRYPTO_ORG',
-      'CHIHUAHUA',
-      'BANDCHAIN',
-      'COMDEX',
-      'REGEN',
-      'IRIS',
-      'EMONEY',
-      'JUNO',
-      'STRIDE',
-      'MARS',
-      'TERRA',
-      'BITSONG',
-      'AKASH',
-      'KI',
-      'PERSISTENCE',
-      'MEDIBLOC',
-      'KUJIRA',
-      'SENTINEL',
-      'INJECTIVE',
-      'SECRET',
-      'KONSTELLATION',
-      'STARNAME',
-      'BITCANNA',
-      'UMEE',
-      'DESMOS',
-      'LUMNETWORK',
+      'BASE',
     ];
     const received = prepare(sample, preferredBlockchains, {
       limit: listLimit,
@@ -181,85 +83,30 @@ describe('usePrepareBlockchainList', () => {
       expect(receivedMoreNames).not.toContain(listName);
     });
 
-    // Check preferred blockchains to be on the main list
+    // Check preferred blockchains end up in the main list
     preferredBlockchains.forEach((blockchain) => {
       expect(receivedListNames).toContain(blockchain);
     });
   });
 
-  it('should prepare the list correctly if user has a long list of preferences ', () => {
-    const listLimit = 10;
+  it('should prepare the list correctly if user has a long list of preferences', () => {
+    const listLimit = 4;
     const preferredBlockchains = [
-      'ETH',
-      'BTC',
-      'SOLANA',
-      'CRYPTO_ORG',
-      'TRON',
-      'BOBA_AVALANCHE',
-      'AKASH',
-      'LUMNETWORK',
-      'KONSTELLATION',
-      'BANDCHAIN',
-      'INJECTIVE',
+      'LINEA',
+      'SCROLL',
+      'BASE',
+      'OPTIMISM',
+      'POLYGON',
     ];
     const expected = [
+      'LINEA',
+      'SCROLL',
+      'BASE',
+      'OPTIMISM',
+      'POLYGON',
       'ETH',
-      'BTC',
-      'SOLANA',
-      'CRYPTO_ORG',
-      'TRON',
-      'BOBA_AVALANCHE',
-      'AKASH',
-      'LUMNETWORK',
-      'KONSTELLATION',
-      'BANDCHAIN',
-      'INJECTIVE',
-      'COSMOS',
-      'OSMOSIS',
       'BSC',
       'ARBITRUM',
-      'POLYGON',
-      'ZKSYNC',
-      'STARKNET',
-      'OPTIMISM',
-      'AVAX_CCHAIN',
-      'POLYGONZK',
-      'LINEA',
-      'NEUTRON',
-      'NOBLE',
-      'CRONOS',
-      'BNB',
-      'AURORA',
-      'MAYA',
-      'THOR',
-      'BOBA',
-      'MOONBEAM',
-      'MOONRIVER',
-      'OKC',
-      'LTC',
-      'BCH',
-      'HECO',
-      'STARGAZE',
-      'CHIHUAHUA',
-      'COMDEX',
-      'REGEN',
-      'IRIS',
-      'EMONEY',
-      'JUNO',
-      'STRIDE',
-      'MARS',
-      'TERRA',
-      'BITSONG',
-      'KI',
-      'PERSISTENCE',
-      'MEDIBLOC',
-      'KUJIRA',
-      'SENTINEL',
-      'SECRET',
-      'STARNAME',
-      'BITCANNA',
-      'UMEE',
-      'DESMOS',
     ];
     const received = prepare(sample, preferredBlockchains, {
       limit: listLimit,
@@ -272,66 +119,17 @@ describe('usePrepareBlockchainList', () => {
   });
 
   it('Last item of the main list should be moved to front if it selected again.', () => {
-    const listLimit = 10;
-    const preferredBlockchains = ['AVAX_CCHAIN', 'BTC'];
+    const listLimit = 4;
+    const preferredBlockchains = ['POLYGON', 'BASE'];
     const expected = [
-      'AVAX_CCHAIN',
-      'BTC',
+      'POLYGON',
+      'BASE',
       'ETH',
-      'COSMOS',
-      'OSMOSIS',
       'BSC',
       'ARBITRUM',
-      'POLYGON',
-      'ZKSYNC',
-      'STARKNET',
       'OPTIMISM',
-      'POLYGONZK',
       'LINEA',
-      'TRON',
-      'NEUTRON',
-      'NOBLE',
-      'SOLANA',
-      'CRONOS',
-      'BNB',
-      'AURORA',
-      'MAYA',
-      'THOR',
-      'BOBA',
-      'MOONBEAM',
-      'MOONRIVER',
-      'OKC',
-      'BOBA_AVALANCHE',
-      'LTC',
-      'BCH',
-      'HECO',
-      'STARGAZE',
-      'CRYPTO_ORG',
-      'CHIHUAHUA',
-      'BANDCHAIN',
-      'COMDEX',
-      'REGEN',
-      'IRIS',
-      'EMONEY',
-      'JUNO',
-      'STRIDE',
-      'MARS',
-      'TERRA',
-      'BITSONG',
-      'AKASH',
-      'KI',
-      'PERSISTENCE',
-      'MEDIBLOC',
-      'KUJIRA',
-      'SENTINEL',
-      'INJECTIVE',
-      'SECRET',
-      'KONSTELLATION',
-      'STARNAME',
-      'BITCANNA',
-      'UMEE',
-      'DESMOS',
-      'LUMNETWORK',
+      'SCROLL',
     ];
 
     const output = prepare(sample, preferredBlockchains, {

package/src/hooks/useStatefulConnect/useStatefulConnect.state.ts

@@ -3,7 +3,7 @@ import type {
   NeedsDerivationPathState,
   NeedsNamespacesState,
 } from './useStatefulConnect.types';
-import type { Namespace } from '@rango-dev/wallets-core/namespaces/common';
+import type { Namespace } from '@hub3js/namespaces';
 
 export interface State {
   status: 'init' | 'namespace' | 'derivationPath' | 'detached';

package/src/hooks/useStatefulConnect/useStatefulConnect.ts

@@ -1,6 +1,6 @@
 import type { HandleConnectOptions, Result } from './useStatefulConnect.types';
 import type { WalletInfoWithExtra } from '../../types';
-import type { Namespace } from '@rango-dev/wallets-core/namespaces/common';
+import type { Namespace } from '@hub3js/namespaces';
 import type { NamespaceData } from '@rango-dev/wallets-shared';
 
 import { WalletState } from '@rango-dev/ui';

package/src/hooks/useStatefulConnect/useStatefulConnect.types.ts

@@ -1,5 +1,5 @@
 import type { ExtendedModalWalletInfo } from '../../utils/wallets';
-import type { Namespace } from '@rango-dev/wallets-core/namespaces/common';
+import type { Namespace } from '@hub3js/namespaces';
 
 export interface HandleConnectOptions {
   // To have a switch between connect and disconnect when user is clicking on a button, this option can be helpful.

package/src/hooks/useWalletList.ts

@@ -1,21 +1,15 @@
 import type { ExtendedModalWalletInfo } from '../utils/wallets';
 import type { WalletInfo } from '@rango-dev/ui';
-import type { BlockchainMeta } from 'rango-sdk';
 
 import { WalletState } from '@rango-dev/ui';
 import { useWallets } from '@rango-dev/wallets-react';
-import {
-  detectMobileScreens,
-  KEPLR_COMPATIBLE_WALLETS,
-  WalletTypes,
-} from '@rango-dev/wallets-shared';
+import { detectMobileScreens, WalletTypes } from '@rango-dev/wallets-shared';
 import { useCallback, useEffect } from 'react';
 
 import { useAppStore } from '../store/AppStore';
 import { configWalletsToWalletName } from '../utils/providers';
 import {
   hashWalletsState,
-  isExperimentalChain,
   mapWalletTypesToWalletInfo,
   sortWalletsBasedOnConnectionState,
 } from '../utils/wallets';
@@ -40,9 +34,8 @@ interface API {
  */
 export function useWalletList(params?: Params): API {
   const { chain } = params || {};
-  const { connectedWallets, getAvailableProviders } = useAppStore();
+  const { getAvailableProviders } = useAppStore();
   const { state, getWalletInfo } = useWallets();
-  const blockchains = useAppStore().blockchains();
   const { handleDisconnect } = useStatefulConnect();
 
   /** It can be what has been set by widget config or as a fallback we use all the supported wallets by our library */
@@ -66,13 +59,6 @@ export function useWalletList(params?: Params): API {
 
   const sortedWallets = sortWalletsBasedOnConnectionState(wallets);
 
-  const isExperimentalChainNotAdded = (walletType: string) =>
-    !connectedWallets.find(
-      (connectedWallet) =>
-        connectedWallet.walletType === walletType &&
-        connectedWallet.chain === chain
-    );
-
   const terminateConnectingWallets = useCallback(() => {
     const connectingWallets =
       wallets?.filter((wallet) => wallet.state === WalletState.CONNECTING) ||
@@ -121,24 +107,15 @@ export function useWalletList(params?: Params): API {
     return isEvmWalletInstalledExceptDefault.length == 0;
   };
 
-  const shouldExcludeWallet = (
-    walletType: string,
-    chain: string,
-    blockchains: BlockchainMeta[]
-  ) => {
+  const shouldExcludeWallet = (walletType: string) => {
     return (
-      (isExperimentalChain(blockchains, chain) &&
-        isExperimentalChainNotAdded(walletType) &&
-        !KEPLR_COMPATIBLE_WALLETS.includes(walletType)) ||
-      (walletType == WalletTypes.DEFAULT &&
-        !shouldShowDefaultInjectedWallet(wallets))
+      walletType == WalletTypes.DEFAULT &&
+      !shouldShowDefaultInjectedWallet(wallets)
     );
   };
 
   return {
-    list: sortedWallets.filter(
-      (wallet) => !shouldExcludeWallet(wallet.type, chain ?? '', blockchains)
-    ),
+    list: sortedWallets.filter((wallet) => !shouldExcludeWallet(wallet.type)),
     terminateConnectingWallets,
   };
 }

package/src/hooks/useWalletProviders/useWalletProviders.helpers.ts

@@ -1,6 +1,6 @@
 import type { ProviderInterface } from '@rango-dev/wallets-react';
 
-import { Provider } from '@rango-dev/wallets-core';
+import { Provider } from '@hub3js/core';
 
 export function hashProviders(
   providers: (string | ProviderInterface | Provider)[]

package/src/store/quote.ts

@@ -26,6 +26,7 @@ import {
 import { isPositiveNumber, sanitizeInputAmount } from '../utils/numbers';
 import {
   ensureLeadingZeroForDecimal,
+  parseNumericValue,
   removeLeadingZeros,
 } from '../utils/sanitizers';
 import { getUsdInputFrom, getUsdOutputFrom } from '../utils/swap';
@@ -249,7 +250,7 @@ const initializer: StateCreator<
     }));
   },
   setInputAmount: (amount) => {
-    let sanitized = amount;
+    let sanitized = parseNumericValue(amount);
     if (!isZeroValue(amount)) {
       // sanitize once a meaningful digit is entered (e.g. "00001" → "1")
       sanitized = removeLeadingZeros(sanitized);

package/src/store/slices/config.ts

@@ -2,9 +2,9 @@ import type { DataSlice } from './data';
 import type { SettingsSlice } from './settings';
 import type { WidgetConfig } from '../../types';
 import type { StateCreatorWithInitialData } from '../app';
+import type { VersionedProviders } from '@hub3js/core/utils';
 
 import { allProviders as getAllProviders } from '@rango-dev/provider-all';
-import { type VersionedProviders } from '@rango-dev/wallets-core';
 
 import { cacheService } from '../../services/cacheService';
 import {
@@ -40,7 +40,7 @@ export const DEFAULT_CONFIG: WidgetConfig = {
   },
   tonConnect: {
     manifestUrl:
-      'https://raw.githubusercontent.com/rango-exchange/rango-types/main/assets/manifests/tonconnect-manifest.json',
+      'https://raw.githubusercontent.com/rango-exchange/assets/refs/heads/main/manifests/tonconnect/manifest.json',
   },
 };
 

package/src/store/slices/data.test.ts

@@ -32,7 +32,7 @@ const DEFAULT_CONFIG: WidgetConfig = {
   },
   tonConnect: {
     manifestUrl:
-      'https://raw.githubusercontent.com/rango-exchange/rango-types/main/assets/manifests/tonconnect-manifest.json',
+      'https://raw.githubusercontent.com/rango-exchange/assets/refs/heads/main/manifests/tonconnect/manifest.json',
   },
 };
 

package/src/store/slices/wallets.ts

@@ -1,5 +1,5 @@
 import type { AppStoreState } from './types';
-import type { Namespace } from '@rango-dev/wallets-core/namespaces/common';
+import type { Namespace } from '@hub3js/namespaces';
 import type { Asset, Token, WalletDetail } from 'rango-sdk';
 
 import BigNumber from 'bignumber.js';
@@ -466,7 +466,7 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
       const { _balances, _aggregatedBalances } =
         computeNextStateAfterWalletBalanceRemoval(
           partialCurrentState,
-          walletType,
+          [walletType],
           options
         );
 
@@ -611,8 +611,10 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
       if (accounts.length === 0 || !accounts[0]) {
         return;
       }
-      // All the `accounts` have same `walletType` so we can pick the first one.
-      const walletType = accounts[0].walletType;
+
+      const walletTypes = [
+        ...new Set(accounts.map((account) => account.walletType)),
+      ];
 
       get().setConnectedWalletAsRefetching(accounts);
 
@@ -630,7 +632,6 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
         return;
       }
       const walletsDetails = response.wallets;
-
       if (walletsDetails) {
         let nextBalances: BalanceState = get()._balances;
         let nextAggregatedBalances: AggregatedBalanceState =
@@ -657,7 +658,7 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
           const { _balances, _aggregatedBalances } =
             computeNextStateAfterWalletBalanceRemoval(
               partialCurrentState,
-              walletType,
+              walletTypes,
               {
                 chains: [wallet.blockChain],
               }
@@ -672,7 +673,7 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
           if (
             !get().connectedWallets.find(
               (connectedWallet) =>
-                connectedWallet.walletType === walletType &&
+                walletTypes.includes(connectedWallet.walletType) &&
                 connectedWallet.address === wallet.address &&
                 connectedWallet.chain === wallet.blockChain
             )
@@ -715,11 +716,23 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
         if (retryOnFailedBalances) {
           const failedWallets: Wallet[] = walletsDetails
             .filter((wallet) => wallet.failed)
-            .map((wallet) => ({
-              chain: wallet.blockChain,
-              walletType: walletType,
-              address: wallet.address,
-            }));
+            .map((wallet) => {
+              const walletType = get().connectedWallets.find(
+                (connectedWallet) =>
+                  connectedWallet.chain === wallet.blockChain &&
+                  connectedWallet.address
+              )?.walletType;
+              // Return null if there is no related connected wallet.
+              if (!walletType) {
+                return null;
+              }
+              return {
+                chain: wallet.blockChain,
+                walletType: walletType,
+                address: wallet.address,
+              };
+            })
+            .filter((wallet) => !!wallet);
           if (failedWallets.length > 0) {
             await get().fetchMainTokensBalances(failedWallets, {
               retryOnFailedBalances: false,

package/src/store/utils/wallets.ts

@@ -8,7 +8,7 @@ import type {
   BalanceState,
   ConnectedWallet,
 } from '../slices/wallets';
-import type { Namespace } from '@rango-dev/wallets-core/namespaces/common';
+import type { Namespace } from '@hub3js/namespaces';
 import type { Asset, WalletDetail } from 'rango-types';
 
 import BigNumber from 'bignumber.js';
@@ -17,7 +17,7 @@ import { ZERO } from '../../constants/numbers';
 import { BALANCE_SEPARATOR } from '../../constants/wallets';
 
 /**
- * Note: We need to use `symbol` as well since native coins and cosmos blockchains don't have `address`
+ * Note: We need to use `symbol` as well since native coins don't have `address`
  * output format: BlockchainId${BALANCE_SEPARATOR}TokenAddress${BALANCE_SEPARATOR}TokenSymbol
  */
 export function createAssetKey(asset: Asset): AssetKey {
@@ -164,14 +164,14 @@ export function computeNextStateAfterWalletBalanceRemoval(
     _aggregatedBalances: AggregatedBalanceState;
     connectedWallets: ConnectedWallet[];
   },
-  walletType: string,
+  walletTypes: string[],
   options?: {
     chains?: string[];
     namespaces?: Namespace[];
   }
 ) {
   let walletsNeedsToBeRemoved = paritalCurrentState.connectedWallets.filter(
-    (connectedWallet) => connectedWallet.walletType === walletType
+    (connectedWallet) => walletTypes.includes(connectedWallet.walletType)
   );
 
   /*
@@ -181,7 +181,7 @@ export function computeNextStateAfterWalletBalanceRemoval(
    * So we only delete balance when there is no connected wallet that has access to that specific chain and address.
    */
   paritalCurrentState.connectedWallets.forEach((connectedWallet) => {
-    if (connectedWallet.walletType !== walletType) {
+    if (!walletTypes.includes(connectedWallet.walletType)) {
       walletsNeedsToBeRemoved = walletsNeedsToBeRemoved.filter((wallet) => {
         const isAnotherWalletHasSameAddressAndChain =
           wallet.chain === connectedWallet.chain &&

package/src/test-utils/fixtures.ts

@@ -25,12 +25,7 @@ const listBlockchains = [
   'TRON',
   'BTC',
   'SCROLL',
-  'COSMOS',
-  'OSMOSIS',
   'METIS',
-  'NEUTRON',
-  'NOBLE',
-  'DYDX',
   'SOLANA',
   'CRONOS',
   'BNB',
@@ -47,43 +42,12 @@ const listBlockchains = [
   'LTC',
   'BCH',
   'HARMONY',
-  'EVMOS',
   'HECO',
-  'SIF',
   'BRISE',
-  'STARGAZE',
   'FUSE',
-  'CRYPTO_ORG',
-  'CHIHUAHUA',
-  'BANDCHAIN',
-  'COMDEX',
-  'REGEN',
-  'IRIS',
-  'EMONEY',
   'GNOSIS',
-  'JUNO',
-  'AXELAR',
-  'STRIDE',
   'KCC',
-  'MARS',
-  'TERRA',
   'TELOS',
-  'BITSONG',
-  'AKASH',
-  'KI',
-  'PERSISTENCE',
-  'MEDIBLOC',
-  'KUJIRA',
-  'SENTINEL',
-  'INJECTIVE',
-  'SECRET',
-  'KONSTELLATION',
-  'STARNAME',
-  'BITCANNA',
-  'UMEE',
-  'DESMOS',
-  'LUMNETWORK',
-  'TERRA_CLASSIC',
   'DASH',
   'DOGE',
 ];
@@ -105,13 +69,10 @@ const listTokens = [
   'FIL',
   'ETC',
   'DAI',
-  'ATOM',
   'IMX',
   'OP',
   'HBAR',
-  'INJ',
   'XLM',
-  'CRO',
   'RNDR',
   'GRT',
   'OKB',
@@ -216,6 +177,7 @@ export function createEvmBlockchain(): EvmBlockchainMeta {
       addressUrl: faker.internet.url(),
       transactionUrl: faker.internet.url(),
       enableGasV2: faker.datatype.boolean(),
+      tokenUrl: faker.internet.url(),
     },
   };
 }

package/src/types/config.ts

@@ -1,5 +1,5 @@
+import type { Provider } from '@hub3js/core';
 import type { Language, theme } from '@rango-dev/ui';
-import type { Provider } from '@rango-dev/wallets-core';
 import type { LegacyProviderInterface } from '@rango-dev/wallets-core/legacy';
 import type { WalletType } from '@rango-dev/wallets-shared';
 import type { Asset } from 'rango-sdk';