@lifi/widget 3.5.1 → 3.6.0-alpha.0

package/hooks/useTokens.ts

@@ -9,7 +9,8 @@ export const useTokens = (selectedChainId?: number) => {
   const { tokens: configTokens } = useWidgetConfig();
   const { data, isLoading } = useQuery({
     queryKey: ['tokens'],
-    queryFn: () => getTokens({ chainTypes: [ChainType.EVM, ChainType.SVM] }),
+    queryFn: () =>
+      getTokens({ chainTypes: [ChainType.EVM, ChainType.SVM, ChainType.UTXO] }),
     refetchInterval: 3_600_000,
     staleTime: 3_600_000,
   });

package/hooks/useWallets.ts

@@ -6,6 +6,7 @@ import {
   createWalletConnectConnector,
   getWalletPriority,
   isWalletInstalled,
+  useConfig as useBigmiConfig,
 } from '@lifi/wallet-management';
 import type { Theme } from '@mui/material';
 import { useMediaQuery } from '@mui/material';
@@ -14,7 +15,7 @@ import type { Wallet } from '@solana/wallet-adapter-react';
 import { useWallet } from '@solana/wallet-adapter-react';
 import { useMemo } from 'react';
 import type { Connector } from 'wagmi';
-import { useConnect, useAccount as useWagmiAccount } from 'wagmi';
+import { useAccount, useConnect } from 'wagmi';
 import { defaultCoinbaseConfig } from '../config/coinbase.js';
 import { defaultMetaMaskConfig } from '../config/metaMask.js';
 import { defaultWalletConnectConfig } from '../config/walletConnect.js';
@@ -25,8 +26,11 @@ export const useWallets = (
   walletConfig?: WidgetWalletConfig,
   chains?: WidgetChains,
 ) => {
-  const account = useWagmiAccount();
-  const { connectors } = useConnect();
+  const bigmiConfig = useBigmiConfig();
+  const wagmiAccount = useAccount();
+  const bigmiAccount = useAccount({ config: bigmiConfig });
+  const { connectors: wagmiConnectors } = useConnect();
+  const { connectors: bigmiConnectors } = useConnect({ config: bigmiConfig });
   const { wallets: solanaWallets } = useWallet();
 
   const isDesktopView = useMediaQuery((theme: Theme) =>
@@ -35,9 +39,9 @@ export const useWallets = (
 
   const wallets = useMemo(() => {
     const evmConnectors: (CreateConnectorFnExtended | Connector)[] =
-      Array.from(connectors);
+      Array.from(wagmiConnectors);
     if (
-      !connectors.some((connector) =>
+      !wagmiConnectors.some((connector) =>
         connector.id.toLowerCase().includes('walletconnect'),
       )
     ) {
@@ -48,7 +52,7 @@ export const useWallets = (
       );
     }
     if (
-      !connectors.some((connector) =>
+      !wagmiConnectors.some((connector) =>
         connector.id.toLowerCase().includes('coinbase'),
       ) &&
       !isWalletInstalled('coinbase')
@@ -60,7 +64,7 @@ export const useWallets = (
       );
     }
     if (
-      !connectors.some((connector) =>
+      !wagmiConnectors.some((connector) =>
         connector.id.toLowerCase().includes('metamask'),
       ) &&
       !isWalletInstalled('metaMask')
@@ -71,16 +75,27 @@ export const useWallets = (
         ),
       );
     }
+    const utxoInstalled = isItemAllowed(ChainType.UTXO, chains?.types)
+      ? bigmiConnectors.filter(
+          (connector) =>
+            isWalletInstalled(connector.id) &&
+            // We should not show already connected connectors
+            bigmiAccount.connector?.id !== connector.id,
+        )
+      : [];
+    const utxoNotDetected = isItemAllowed(ChainType.UTXO, chains?.types)
+      ? bigmiConnectors.filter((connector) => !isWalletInstalled(connector.id!))
+      : [];
     const evmInstalled = isItemAllowed(ChainType.EVM, chains?.types)
       ? evmConnectors.filter(
           (connector) =>
-            isWalletInstalled(connector.id!) &&
+            isWalletInstalled(connector.id) &&
             // We should not show already connected connectors
-            account.connector?.id !== connector.id,
+            wagmiAccount.connector?.id !== connector.id,
         )
       : [];
     const evmNotDetected = isItemAllowed(ChainType.EVM, chains?.types)
-      ? evmConnectors.filter((connector) => !isWalletInstalled(connector.id!))
+      ? evmConnectors.filter((connector) => !isWalletInstalled(connector.id))
       : [];
     const svmInstalled = isItemAllowed(ChainType.SVM, chains?.types)
       ? solanaWallets?.filter(
@@ -97,27 +112,33 @@ export const useWallets = (
         )
       : [];
 
-    const installedWallets = [...evmInstalled, ...svmInstalled].sort(
-      walletComparator,
-    );
+    const installedWallets = [
+      ...evmInstalled,
+      ...svmInstalled,
+      ...utxoInstalled,
+    ].sort(walletComparator);
 
     if (isDesktopView) {
-      const notDetectedWallets = [...evmNotDetected, ...svmNotDetected].sort(
-        walletComparator,
-      );
+      const notDetectedWallets = [
+        ...evmNotDetected,
+        ...svmNotDetected,
+        ...utxoNotDetected,
+      ].sort(walletComparator);
       installedWallets.push(...notDetectedWallets);
     }
 
     return installedWallets;
   }, [
-    account.connector?.id,
+    wagmiConnectors,
     chains?.types,
-    connectors,
-    isDesktopView,
+    bigmiConnectors,
     solanaWallets,
+    isDesktopView,
+    walletConfig?.walletConnect,
     walletConfig?.coinbase,
     walletConfig?.metaMask,
-    walletConfig?.walletConnect,
+    bigmiAccount.connector?.id,
+    wagmiAccount.connector?.id,
   ]);
 
   return wallets;

package/i18n/en.json

@@ -16,10 +16,10 @@
     "bridgeReview": "Review bridge",
     "buy": "Buy",
     "cancel": "Cancel",
-    "changeWallet": "Change wallet",
     "checkoutReview": "Review purchase",
     "close": "Close",
     "confirm": "Confirm",
+    "connectAnotherWallet": "Connect another wallet",
     "connectWallet": "Connect wallet",
     "contactSupport": "Contact support",
     "continue": "Continue",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/widget",
-  "version": "3.5.1",
+  "version": "3.6.0-alpha.0",
   "description": "LI.FI Widget for cross-chain bridging and swapping. It will drive your multi-chain strategy and attract new users from everywhere.",
   "type": "module",
   "main": "./_esm/index.js",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@lifi/sdk": "^3.2.0",
-    "@lifi/wallet-management": "^3.1.4",
+    "@lifi/sdk": "^3.3.0-alpha.1",
+    "@lifi/wallet-management": "^3.2.0-alpha.0",
     "@mui/icons-material": "^5.16.7",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.7",
@@ -53,8 +53,8 @@
     "react-intersection-observer": "^9.13.1",
     "react-router-dom": "^6.26.2",
     "uuid": "^10.0.0",
-    "viem": "^2.21.4",
-    "wagmi": "^2.12.9",
+    "viem": "^2.21.5",
+    "wagmi": "^2.12.10",
     "zustand": "^4.5.5"
   },
   "peerDependencies": {

package/pages/SelectWalletPage/EVMListItemButton.tsx

@@ -6,7 +6,8 @@ import {
 } from '@lifi/wallet-management';
 import { Avatar, ListItemAvatar } from '@mui/material';
 import type { Connector } from 'wagmi';
-import { useConnect, useDisconnect } from 'wagmi';
+import { useConfig } from 'wagmi';
+import { connect, disconnect, getAccount } from 'wagmi/actions';
 import { ListItemButton } from '../../components/ListItemButton.js';
 import { ListItemText } from '../../components/ListItemText.js';
 import { useNavigateBack } from '../../hooks/useNavigateBack.js';
@@ -14,20 +15,17 @@ import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
 import { WidgetEvent } from '../../types/events.js';
 
 interface EVMListItemButtonProps {
-  connectedConnector?: Connector;
   connector: CreateConnectorFnExtended | Connector;
   onNotInstalled(connector: Connector): void;
 }
 
 export const EVMListItemButton = ({
-  connectedConnector,
   connector,
   onNotInstalled,
 }: EVMListItemButtonProps) => {
   const { navigateBack } = useNavigateBack();
   const emitter = useWidgetEvents();
-  const { connectAsync } = useConnect();
-  const { disconnectAsync } = useDisconnect();
+  const config = useConfig();
 
   const handleEVMConnect = async () => {
     const identityCheckPassed = await isWalletInstalledAsync(
@@ -37,21 +35,16 @@ export const EVMListItemButton = ({
       onNotInstalled(connector as Connector);
       return;
     }
-    if (connectedConnector) {
-      await disconnectAsync({ connector: connectedConnector });
+    const connectedAccount = getAccount(config);
+    if (connectedAccount.connector) {
+      await disconnect(config, { connector: connectedAccount.connector });
     }
-    await connectAsync(
-      { connector },
-      {
-        onSuccess(data) {
-          emitter.emit(WidgetEvent.WalletConnected, {
-            address: data.accounts[0],
-            chainId: data.chainId,
-            chainType: ChainType.EVM,
-          });
-        },
-      },
-    );
+    const data = await connect(config, { connector });
+    emitter.emit(WidgetEvent.WalletConnected, {
+      address: data.accounts[0],
+      chainId: data.chainId,
+      chainType: ChainType.EVM,
+    });
     navigateBack();
   };
 

package/pages/SelectWalletPage/SelectWalletPage.tsx

@@ -1,3 +1,4 @@
+import { ChainType } from '@lifi/sdk';
 import {
   Button,
   DialogActions,
@@ -9,7 +10,6 @@ import type { Wallet } from '@solana/wallet-adapter-react';
 import { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { Connector } from 'wagmi';
-import { useAccount as useWagmiAccount } from 'wagmi';
 import { Dialog } from '../../components/Dialog.js';
 import { PageContainer } from '../../components/PageContainer.js';
 import { useHeader } from '../../hooks/useHeader.js';
@@ -17,11 +17,11 @@ import { useWallets } from '../../hooks/useWallets.js';
 import { useWidgetConfig } from '../../providers/WidgetProvider/WidgetProvider.js';
 import { EVMListItemButton } from './EVMListItemButton.js';
 import { SVMListItemButton } from './SVMListItemButton.js';
+import { UTXOListItemButton } from './UTXOListItemButton.js';
 
 export const SelectWalletPage = () => {
   const { t } = useTranslation();
   const { chains, walletConfig } = useWidgetConfig();
-  const account = useWagmiAccount();
   const [walletIdentity, setWalletIdentity] = useState<{
     show: boolean;
     connector?: Connector;
@@ -56,11 +56,16 @@ export const SelectWalletPage = () => {
         }}
       >
         {wallets?.map((connector) =>
-          (connector as Connector).id ? (
+          (connector as Connector).type === ChainType.UTXO ? (
+            <UTXOListItemButton
+              key={(connector as Connector).id}
+              connector={connector as Connector}
+              onNotInstalled={handleNotInstalled}
+            />
+          ) : (connector as Connector).id ? (
             <EVMListItemButton
               key={(connector as Connector).id}
               connector={connector as Connector}
-              connectedConnector={account.connector}
               onNotInstalled={handleNotInstalled}
             />
           ) : (

package/pages/SelectWalletPage/UTXOListItemButton.tsx

@@ -0,0 +1,67 @@
+import { ChainType } from '@lifi/sdk';
+import type { CreateConnectorFnExtended } from '@lifi/wallet-management';
+import {
+  getConnectorIcon,
+  isWalletInstalledAsync,
+  useConfig,
+} from '@lifi/wallet-management';
+import { Avatar, ListItemAvatar } from '@mui/material';
+import type { Connector } from 'wagmi';
+import { connect, disconnect, getAccount } from 'wagmi/actions';
+import { ListItemButton } from '../../components/ListItemButton.js';
+import { ListItemText } from '../../components/ListItemText.js';
+import { useNavigateBack } from '../../hooks/useNavigateBack.js';
+import { useWidgetEvents } from '../../hooks/useWidgetEvents.js';
+import { WidgetEvent } from '../../types/events.js';
+
+interface UTXOListItemButtonProps {
+  connector: CreateConnectorFnExtended | Connector;
+  onNotInstalled(connector: Connector): void;
+}
+
+export const UTXOListItemButton = ({
+  connector,
+  onNotInstalled,
+}: UTXOListItemButtonProps) => {
+  const { navigateBack } = useNavigateBack();
+  const emitter = useWidgetEvents();
+  const config = useConfig();
+
+  const handleUTXOConnect = async () => {
+    const identityCheckPassed = await isWalletInstalledAsync(
+      (connector as Connector).id,
+    );
+    if (!identityCheckPassed) {
+      onNotInstalled(connector as Connector);
+      return;
+    }
+    const connectedAccount = getAccount(config);
+    if (connectedAccount.connector) {
+      await disconnect(config, { connector: connectedAccount.connector });
+    }
+    const data = await connect(config, { connector });
+    emitter.emit(WidgetEvent.WalletConnected, {
+      address: data.accounts[0],
+      chainId: data.chainId,
+      chainType: ChainType.UTXO,
+    });
+    navigateBack();
+  };
+
+  const connectorName: string =
+    (connector as CreateConnectorFnExtended).displayName || connector.name;
+
+  return (
+    <ListItemButton key={connector.id} onClick={handleUTXOConnect}>
+      <ListItemAvatar>
+        <Avatar
+          src={getConnectorIcon(connector as Connector)}
+          alt={connectorName}
+        >
+          {connectorName?.[0]}
+        </Avatar>
+      </ListItemAvatar>
+      <ListItemText primary={`${connectorName} (Bitcoin)`} />
+    </ListItemButton>
+  );
+};

package/providers/I18nProvider/types.ts

@@ -12,14 +12,14 @@ export type LanguageResource = typeof languages.en;
 
 export type LanguageResources =
   | {
-      [language in LanguageKey]?: PartialResource<LanguageResource>;
+      [K in LanguageKey]?: PartialResource<LanguageResource>;
     }
   | {
       [language: string]: PartialResource<LanguageResource>;
     };
 
 export type LanguageTranslationResource = {
-  [namespace in 'translation']: PartialResource<LanguageResource>;
+  [N in 'translation']: PartialResource<LanguageResource>;
 };
 
 export type LanguageTranslationResources = {

package/providers/WalletProvider/SDKProviders.tsx

@@ -1,16 +1,24 @@
 import type { SDKProvider } from '@lifi/sdk';
-import { ChainType, EVM, Solana, config } from '@lifi/sdk';
+import { ChainType, EVM, Solana, UTXO, config } from '@lifi/sdk';
+import {
+  getConnectorClient as getBigmiConnectorClient,
+  useConfig as useBigmiConfig,
+} from '@lifi/wallet-management';
 import type { SignerWalletAdapter } from '@solana/wallet-adapter-base';
 import { useWallet } from '@solana/wallet-adapter-react';
-import { getWalletClient, switchChain } from '@wagmi/core';
+import {
+  getConnectorClient as getWagmiConnectorClient,
+  switchChain,
+} from '@wagmi/core';
 import { useEffect } from 'react';
-import { useConfig } from 'wagmi';
+import { useConfig as useWagmiConfig } from 'wagmi';
 import { useWidgetConfig } from '../WidgetProvider/WidgetProvider.js';
 
 export const SDKProviders = () => {
   const { sdkConfig } = useWidgetConfig();
   const { wallet } = useWallet();
-  const wagmiConfig = useConfig();
+  const wagmiConfig = useWagmiConfig();
+  const bigmiConfig = useBigmiConfig();
 
   useEffect(() => {
     // Configure SDK Providers
@@ -21,13 +29,16 @@ export const SDKProviders = () => {
     const hasConfiguredSVMProvider = sdkConfig?.providers?.some(
       (provider) => provider.type === ChainType.SVM,
     );
+    const hasConfiguredUTXOProvider = sdkConfig?.providers?.some(
+      (provider) => provider.type === ChainType.UTXO,
+    );
     if (!hasConfiguredEVMProvider) {
       providers.push(
         EVM({
-          getWalletClient: () => getWalletClient(wagmiConfig),
+          getWalletClient: () => getWagmiConnectorClient(wagmiConfig),
           switchChain: async (chainId: number) => {
             const chain = await switchChain(wagmiConfig, { chainId });
-            return getWalletClient(wagmiConfig, { chainId: chain.id });
+            return getWagmiConnectorClient(wagmiConfig, { chainId: chain.id });
           },
         }),
       );
@@ -41,11 +52,18 @@ export const SDKProviders = () => {
         }),
       );
     }
+    if (!hasConfiguredUTXOProvider) {
+      providers.push(
+        UTXO({
+          getWalletClient: () => getBigmiConnectorClient(bigmiConfig),
+        }),
+      );
+    }
     if (sdkConfig?.providers?.length) {
       providers.push(...sdkConfig?.providers);
     }
     config.setProviders(providers);
-  }, [sdkConfig?.providers, wagmiConfig, wallet?.adapter]);
+  }, [bigmiConfig, sdkConfig?.providers, wagmiConfig, wallet?.adapter]);
 
   return null;
 };

package/providers/WalletProvider/UTXOBaseProvider.tsx

@@ -0,0 +1,28 @@
+import type { DefaultWagmiConfigResult } from '@lifi/wallet-management';
+import {
+  BigmiProvider,
+  createDefaultBigmiConfig,
+  useReconnect,
+} from '@lifi/wallet-management';
+import { useRef, type FC, type PropsWithChildren } from 'react';
+
+export const UTXOBaseProvider: FC<PropsWithChildren> = ({ children }) => {
+  const bigmi = useRef<DefaultWagmiConfigResult>();
+
+  if (!bigmi.current) {
+    bigmi.current = createDefaultBigmiConfig({
+      wagmiConfig: {
+        ssr: true,
+        multiInjectedProviderDiscovery: false,
+      },
+    });
+  }
+
+  useReconnect(bigmi.current.config);
+
+  return (
+    <BigmiProvider config={bigmi.current.config} reconnectOnMount={false}>
+      {children}
+    </BigmiProvider>
+  );
+};

package/providers/WalletProvider/UTXOExternalContext.ts

@@ -0,0 +1,3 @@
+import { createContext } from 'react';
+
+export const UTXOExternalContext = createContext<boolean>(false);

package/providers/WalletProvider/UTXOProvider.tsx

@@ -0,0 +1,26 @@
+import { ChainType } from '@lifi/sdk';
+import { BigmiContext } from '@lifi/wallet-management';
+import { useContext, type FC, type PropsWithChildren } from 'react';
+import { isItemAllowed } from '../../utils/item.js';
+import { useWidgetConfig } from '../WidgetProvider/WidgetProvider.js';
+import { UTXOBaseProvider } from './UTXOBaseProvider.js';
+import { UTXOExternalContext } from './UTXOExternalContext.js';
+
+export function useInBigmiContext(): boolean {
+  const { chains } = useWidgetConfig();
+  const context = useContext(BigmiContext);
+
+  return Boolean(context) && isItemAllowed(ChainType.UTXO, chains?.types);
+}
+
+export const UTXOProvider: FC<PropsWithChildren> = ({ children }) => {
+  const inBigmiContext = useInBigmiContext();
+
+  return inBigmiContext ? (
+    <UTXOExternalContext.Provider value={inBigmiContext}>
+      {children}
+    </UTXOExternalContext.Provider>
+  ) : (
+    <UTXOBaseProvider>{children}</UTXOBaseProvider>
+  );
+};

package/providers/WalletProvider/WalletProvider.tsx

@@ -2,13 +2,16 @@ import { type FC, type PropsWithChildren } from 'react';
 import { EVMProvider } from './EVMProvider.js';
 import { SDKProviders } from './SDKProviders.js';
 import { SVMProvider } from './SVMProvider.js';
+import { UTXOProvider } from './UTXOProvider.js';
 
 export const WalletProvider: FC<PropsWithChildren> = ({ children }) => {
   return (
     <EVMProvider>
       <SVMProvider>
-        <SDKProviders />
-        {children}
+        <UTXOProvider>
+          <SDKProviders />
+          {children}
+        </UTXOProvider>
       </SVMProvider>
     </EVMProvider>
   );

package/providers/WalletProvider/useHasExternalWalletProvider.ts

@@ -2,6 +2,7 @@ import { ChainType } from '@lifi/sdk';
 import { useContext, useMemo } from 'react';
 import { EVMExternalContext } from './EVMExternalContext.js';
 import { SVMExternalContext } from './SVMExternalContext.js';
+import { UTXOExternalContext } from './UTXOExternalContext.js';
 
 interface ExternalWalletProvider {
   hasExternalProvider: boolean;
@@ -11,6 +12,7 @@ interface ExternalWalletProvider {
 export function useHasExternalWalletProvider(): ExternalWalletProvider {
   const hasExternalEVMContext = useContext(EVMExternalContext);
   const hasExternalSVMContext = useContext(SVMExternalContext);
+  const hasExternalUTXOContext = useContext(UTXOExternalContext);
 
   const providers = useMemo(() => {
     const providers = [];
@@ -20,8 +22,11 @@ export function useHasExternalWalletProvider(): ExternalWalletProvider {
     if (hasExternalSVMContext) {
       providers.push(ChainType.SVM);
     }
+    if (hasExternalUTXOContext) {
+      providers.push(ChainType.UTXO);
+    }
     return providers;
-  }, [hasExternalEVMContext, hasExternalSVMContext]);
+  }, [hasExternalEVMContext, hasExternalSVMContext, hasExternalUTXOContext]);
 
   return {
     hasExternalProvider: hasExternalEVMContext || hasExternalSVMContext,

package/providers/WidgetProvider/WidgetProvider.tsx

@@ -88,7 +88,7 @@ export const WidgetProvider: React.FC<
         },
         disableVersionCheck: true,
         widgetVersion: version,
-        preloadChains: false,
+        // preloadChains: false,
       };
       if (!sdkInitialized) {
         createConfig(_config);

package/stores/form/types.ts

@@ -32,17 +32,17 @@ export type FormFieldArray<T extends FormFieldNames[]> = {
   [K in keyof T]: ExtractValueType<FormValues[T[K]]>;
 };
 
-export type TouchedFields = { [key in FormFieldNames]?: boolean };
+export type TouchedFields = { [K in FormFieldNames]?: boolean };
 
 type ValidationFn = (value: any) => Promise<boolean | string>;
 export interface ValidationProps {
   isValid: boolean;
   isValidating: boolean;
   errors: {
-    [key in FormFieldNames]?: string;
+    [K in FormFieldNames]?: string;
   };
   validation: {
-    [key in FormFieldNames]?: ValidationFn;
+    [K in FormFieldNames]?: ValidationFn;
   };
 }
 
@@ -58,7 +58,7 @@ export interface ValidationActions {
 export interface FormProps {
   defaultValues: FormValues;
   userValues: FormValues;
-  touchedFields: { [key in FormFieldNames]?: boolean };
+  touchedFields: { [K in FormFieldNames]?: boolean };
 }
 
 interface ResetOptions {

package/themes/createTheme.ts

@@ -63,7 +63,7 @@ export const createTheme = (
   const borderRadiusSecondary =
     widgetTheme.shape?.borderRadiusSecondary ?? shape.borderRadiusSecondary;
 
-  return createMuiTheme({
+  const theme = createMuiTheme({
     container: widgetTheme.container,
     header: widgetTheme.header,
     navigation: {
@@ -409,4 +409,6 @@ export const createTheme = (
       },
     },
   });
+
+  return theme;
 };

package/utils/chainType.ts

@@ -1,11 +1,10 @@
-import { ChainId, ChainType } from '@lifi/sdk';
+import { ChainId, ChainType, isSVMAddress, isUTXOAddress } from '@lifi/sdk';
 import { isAddress as isEVMAddress } from 'viem';
-import { isSVMAddress } from './svm.js';
 
 const chainTypeAddressValidation = {
   [ChainType.EVM]: isEVMAddress,
   [ChainType.SVM]: isSVMAddress,
-  [ChainType.UTXO]: () => false,
+  [ChainType.UTXO]: isUTXOAddress,
 };
 
 export const getChainTypeFromAddress = (

package/utils/fees.ts

@@ -104,20 +104,22 @@ export const getFeeCostsBreakdown = (
 export const getStepFeeCostsBreakdown = (
   feeCosts: FeeCost[] | GasCost[],
 ): FeesBreakdown => {
-  const token = feeCosts[0].token;
-  const amount = feeCosts.reduce(
-    (amount, feeCost) => amount + BigInt(feeCost.amount || 0),
-    0n,
-  );
-  const amountUSD = feeCosts.reduce(
-    (amount, feeCost) =>
-      amount +
-      parseFloat(feeCost.token.priceUSD || '0') *
-        parseFloat(
-          formatUnits(BigInt(feeCost.amount || 0), feeCost.token.decimals),
-        ),
-    0,
+  const { token } = feeCosts[0];
+
+  const { amount, amountUSD } = feeCosts.reduce(
+    (acc, feeCost) => {
+      const feeAmount = BigInt(Number(feeCost.amount).toFixed(0) || 0);
+      const amountUSD =
+        parseFloat(feeCost.token.priceUSD || '0') *
+        parseFloat(formatUnits(feeAmount, feeCost.token.decimals));
+
+      acc.amount += feeAmount;
+      acc.amountUSD += amountUSD;
+      return acc;
+    },
+    { amount: 0n, amountUSD: 0 },
   );
+
   return {
     amount,
     amountUSD,

package/_esm/utils/svm.d.ts

@@ -1 +0,0 @@
-export declare const isSVMAddress: (address: string) => boolean;