@ledgerhq/live-common 34.51.0-nightly.9 → 34.51.0

package/src/e2e/families/bitcoin.ts

@@ -1,7 +1,12 @@
 import expect from "expect";
 import { Transaction } from "../models/Transaction";
-import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
-import { getSpeculosModel } from "../speculosAppVersion";
+import {
+  pressBoth,
+  pressUntilTextFound,
+  waitFor,
+  containsSubstringInEvent,
+  getSpeculosModel,
+} from "../speculos";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import invariant from "invariant";
@@ -22,7 +27,7 @@ export async function sendBTC(tx: Transaction) {
   const speculosDevice = getSpeculosModel();
   try {
     const events =
-      speculosDevice === Device.LNS.name
+      speculosDevice === Device.LNS
         ? await pressUntilTextFound(DeviceLabels.CONTINUE)
         : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
@@ -30,7 +35,7 @@ export async function sendBTC(tx: Transaction) {
     const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
     await pressBoth();
-    if (speculosDevice === Device.LNS.name) {
+    if (speculosDevice === Device.LNS) {
       await pressUntilTextFound(DeviceLabels.SIGN);
       await pressBoth();
       await waitFor(DeviceLabels.BITCOIN_IS_READY);

package/src/e2e/families/cardano.ts

@@ -11,7 +11,7 @@ import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 
 export async function sendCardano(tx: Transaction) {
-  const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS.name;
+  const isNanoS = process.env.SPECULOS_DEVICE === Device.LNS;
   await waitFor(DeviceLabels.NEW_ORDINARY);
   await (isNanoS ? pressRightButton() : pressBoth());
   if (isNanoS) {
@@ -66,7 +66,7 @@ export async function delegateCardano() {
     [DeviceLabels.CONFIRM, "right"],
   ] as const;
 
-  const steps = process.env.SPECULOS_DEVICE === Device.LNS.name ? LNSSpecificSteps : commonSteps;
+  const steps = process.env.SPECULOS_DEVICE === Device.LNS ? LNSSpecificSteps : commonSteps;
 
   for (const [label, action] of steps) {
     try {

package/src/e2e/families/evm.ts

@@ -1,7 +1,12 @@
 import expect from "expect";
 import { NFTTransaction, Transaction } from "../models/Transaction";
-import { pressBoth, pressUntilTextFound, containsSubstringInEvent, waitFor } from "../speculos";
-import { getSpeculosModel } from "../speculosAppVersion";
+import {
+  pressBoth,
+  pressUntilTextFound,
+  containsSubstringInEvent,
+  waitFor,
+  getSpeculosModel,
+} from "../speculos";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { DeviceModelId } from "@ledgerhq/types-devices";
@@ -13,7 +18,7 @@ export async function sendEVM(tx: Transaction) {
       : await pressUntilTextFound(DeviceLabels.ACCEPT);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-  if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS.name) {
+  if (tx.accountToCredit.ensName && process.env.SPECULOS_DEVICE !== Device.LNS) {
     const isENSNameCorrect = containsSubstringInEvent(tx.accountToCredit.ensName, events);
     expect(isENSNameCorrect).toBeTruthy();
   } else {

package/src/e2e/families/solana.ts

@@ -4,11 +4,13 @@ import {
   pressUntilTextFound,
   containsSubstringInEvent,
   getDelegateEvents,
+  getSpeculosModel,
 } from "../speculos";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { Transaction } from "../models/Transaction";
 import { Delegate } from "../models/Delegate";
+import { DeviceModelId } from "@ledgerhq/types-devices";
 
 export async function delegateSolana(delegatingAccount: Delegate) {
   await getDelegateEvents(delegatingAccount);
@@ -16,10 +18,13 @@ export async function delegateSolana(delegatingAccount: Delegate) {
 }
 
 export async function sendSolana(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.APPROVE);
+  const events =
+    getSpeculosModel() !== DeviceModelId.nanoS
+      ? await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION)
+      : await pressUntilTextFound(DeviceLabels.APPROVE);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
-  if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
+  if (process.env.SPECULOS_DEVICE !== Device.LNS) {
     const isAddressCorrect = containsSubstringInEvent(
       tx.accountToCredit.parentAccount?.address ?? tx.accountToCredit.address,
       events,

package/src/e2e/families/tezos.ts

@@ -1,5 +1,10 @@
-import { getDelegateEvents, getDeviceLabels, pressBoth, pressUntilTextFound } from "../speculos";
-import { getSpeculosModel } from "../speculosAppVersion";
+import {
+  getDelegateEvents,
+  getDeviceLabels,
+  getSpeculosModel,
+  pressBoth,
+  pressUntilTextFound,
+} from "../speculos";
 import { Delegate } from "../models/Delegate";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { DeviceLabels } from "../enum/DeviceLabels";

package/src/e2e/speculos.ts

@@ -16,6 +16,7 @@ import { getEnv } from "@ledgerhq/live-env";
 import { getCryptoCurrencyById } from "../currencies";
 import { DeviceLabels } from "./enum/DeviceLabels";
 import { Account } from "./enum/Account";
+import { Device as CryptoWallet } from "./enum/Device";
 import { Currency } from "./enum/Currency";
 import expect from "expect";
 import { sendBTC, sendBTCBasedCoin } from "./families/bitcoin";
@@ -42,7 +43,6 @@ import { delegateOsmosis } from "./families/osmosis";
 import { AppInfos } from "./enum/AppInfos";
 import { DEVICE_LABELS_CONFIG } from "./data/deviceLabelsData";
 import { sendSui } from "./families/sui";
-import { getAppVersionFromCatalog, getSpeculosModel } from "./speculosAppVersion";
 
 const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
 
@@ -51,7 +51,6 @@ export type Spec = {
   appQuery: {
     model: DeviceModelId;
     appName: string;
-    appVersion?: string;
   };
   /** @deprecated */
   dependency?: string;
@@ -75,6 +74,19 @@ export function setExchangeDependencies(dependencies: Dependency[]) {
   specs["Exchange"].dependencies = Array.from(map.values());
 }
 
+export function getSpeculosModel() {
+  const speculosDevice = process.env.SPECULOS_DEVICE;
+  switch (speculosDevice) {
+    case CryptoWallet.LNS:
+      return DeviceModelId.nanoS;
+    case CryptoWallet.LNX:
+      return DeviceModelId.nanoX;
+    case CryptoWallet.LNSP:
+    default:
+      return DeviceModelId.nanoSP;
+  }
+}
+
 type Specs = {
   [key: string]: Spec;
 };
@@ -300,6 +312,7 @@ export const specs: Specs = {
     },
     dependency: "",
   },
+
   Celo: {
     currency: getCryptoCurrencyById("celo"),
     appQuery: {
@@ -354,21 +367,13 @@ export async function startSpeculos(
   invariant(seed, "SEED is not set");
   const coinapps = COINAPPS;
   invariant(coinapps, "COINAPPS is not set");
-  const appCandidates = await listAppCandidates(coinapps);
-
-  const nanoAppCatalogPath = getEnv("E2E_NANO_APP_VERSION_PATH");
+  let appCandidates;
 
-  const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
-  try {
-    const displayName = spec.currency?.managerAppName || appQuery.appName;
-    const catalogVersion = await getAppVersionFromCatalog(displayName, nanoAppCatalogPath);
-    if (catalogVersion) {
-      appQuery.appVersion = catalogVersion;
-    }
-  } catch (e) {
-    console.warn("[speculos] Unable to fetch app version from catalog", e);
+  if (!appCandidates) {
+    appCandidates = await listAppCandidates(coinapps);
   }
 
+  const { appQuery, dependency, onSpeculosDeviceCreated } = spec;
   const appCandidate = findLatestAppCandidate(appCandidates, appQuery);
   const { model } = appQuery;
   const { dependencies } = spec;
@@ -801,7 +806,10 @@ export async function getDelegateEvents(delegatingAccount: Delegate): Promise<st
 
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  const events =
+    getSpeculosModel() === DeviceModelId.nanoS
+      ? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
+      : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
   verifySwapData(swap, events, amount);
   await pressBoth();
 }
@@ -826,7 +834,6 @@ function verifySwapData(swap: Swap, events: string[], amount: string) {
   if (getSpeculosModel() !== DeviceModelId.nanoS) {
     expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
   }
-
   expectDeviceScreenContains(amount, events, `Amount ${amount} not found on the device screen`);
 }
 

package/src/exchange/swap/hooks/usePickDefaultAccount.ts

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { AccountLike } from "@ledgerhq/types-live";
 import { useCurrenciesByMarketcap } from "../../../currencies/hooks";
-import { listCryptoCurrencies } from "../../../currencies";
+import { listCryptoCurrencies, listTokens } from "../../../currencies";
 import { getAvailableAccountsById } from "../utils";
 
 // Pick a default source account if none are selected.
@@ -10,7 +10,7 @@ export const usePickDefaultAccount = (
   fromAccount: AccountLike | null | undefined,
   setFromAccount: (account: AccountLike) => void,
 ): void => {
-  const list = listCryptoCurrencies();
+  const list = [...listCryptoCurrencies(), ...listTokens()];
   const allCurrencies = useCurrenciesByMarketcap(list);
 
   useEffect(() => {

package/src/exchange/swap/hooks/useSwapTransaction.ts

@@ -36,7 +36,6 @@ export const useFromAmountStatusMessage = (
   { account, parentAccount, status, transaction }: Result<Transaction>,
   // The order of errors/warnings here will determine the precedence
   statusTypeToInclude: string[],
-  sponsored?: boolean,
 ): Error | undefined => {
   const statusEntries = useMemo(
     () => statusTypeToInclude.map(statusType => (status.errors || status.warnings)?.[statusType]),
@@ -66,9 +65,7 @@ export const useFromAmountStatusMessage = (
       .filter(errorOrWarning => !(errorOrWarning instanceof AmountRequired));
     const isRelevantStatus = (relevantStatus as Error) instanceof NotEnoughGas;
 
-    // Skip gas validation for sponsored transactions since gas fees are covered by sponsor
-
-    if (isRelevantStatus && currency && estimatedFees && !sponsored) {
+    if (isRelevantStatus && currency && estimatedFees) {
       const query = new URLSearchParams({
         // get account id first and set it equal to account.
         // if parent account exists then overwrite the former.
@@ -89,15 +86,7 @@ export const useFromAmountStatusMessage = (
     }
 
     return relevantStatus;
-  }, [
-    statusEntries,
-    currency,
-    estimatedFees,
-    transaction?.amount,
-    account?.id,
-    parentAccount?.id,
-    sponsored,
-  ]);
+  }, [statusEntries, currency, estimatedFees, transaction?.amount, account?.id, parentAccount?.id]);
 };
 
 type UseSwapTransactionProps = {
@@ -111,7 +100,6 @@ type UseSwapTransactionProps = {
   refreshRate?: number;
   allowRefresh?: boolean;
   isEnabled?: boolean;
-  sponsored?: boolean;
 };
 
 export const useSwapTransaction = ({
@@ -125,7 +113,6 @@ export const useSwapTransaction = ({
   refreshRate,
   allowRefresh,
   isEnabled,
-  sponsored,
 }: UseSwapTransactionProps): SwapTransactionType => {
   const bridgeTransaction = useBridgeTransaction(() => ({
     account: defaultAccount,
@@ -153,11 +140,11 @@ export const useSwapTransaction = ({
 
   const { account: toAccount } = toState;
 
-  const fromAmountError = useFromAmountStatusMessage(
-    bridgeTransaction,
-    ["gasPrice", "amount", "gasLimit"],
-    sponsored,
-  );
+  const fromAmountError = useFromAmountStatusMessage(bridgeTransaction, [
+    "gasPrice",
+    "amount",
+    "gasLimit",
+  ]);
 
   const { isSwapReversable, reverseSwap } = useReverseAccounts({
     accounts,

package/src/exchange/swap/transactionStrategies.ts

@@ -130,7 +130,6 @@ export function evmTransaction({
   recipient,
   customFeeConfig,
   extraTransactionParameters,
-  sponsored,
 }: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "evm" }>> {
   if (customFeeConfig?.gasLimit) {
     delete customFeeConfig.gasLimit;
@@ -143,7 +142,6 @@ export function evmTransaction({
       recipient,
       ...customFeeConfig,
       data: Buffer.from(extraTransactionParameters, "hex"),
-      sponsored,
     };
   }
   return {
@@ -151,7 +149,6 @@ export function evmTransaction({
     amount,
     recipient,
     ...customFeeConfig,
-    sponsored,
   };
 }
 
@@ -245,7 +242,6 @@ export type TransactionWithCustomFee = TransactionCommon & {
   customErrorType?: "swap";
   extraTransactionParameters?: string;
   family: string;
-  sponsored?: boolean;
 };
 
 // Define a specific type for the strategy functions, assuming they might need parameters

package/src/exchange/swap/types.ts

@@ -207,7 +207,6 @@ type SwapStateRequest = {
   seedIdTo?: string;
   refundAddress?: string;
   payoutAddress?: string;
-  sponsored?: boolean;
 }>;
 
 export type SwapStateAcceptedRequest = SwapStateRequest & {

package/src/families/evm/walletApiAdapter.ts

@@ -37,12 +37,6 @@ const convertToLiveTransaction: ConvertToLiveTransaction<
     liveTx.data = walletApiTransaction.data;
   }
 
-  // Propagate sponsored flag if provided by the Wallet API transaction
-  // This enables fee validation logic to skip NotEnoughGas for sponsored txs
-  if ("sponsored" in walletApiTransaction) {
-    liveTx.sponsored = walletApiTransaction.sponsored;
-  }
-
   if (walletApiTransaction.gasLimit) {
     liveTx.gasLimit = walletApiTransaction.gasLimit;
     liveTx.customGasLimit = walletApiTransaction.gasLimit;

package/src/families/internet_computer/__snapshots__/bridge.integration.test.ts.snap

@@ -44,7 +44,7 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
   [
     {
       "accountId": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer",
-      "blockHash": "",
+      "blockHash": null,
       "blockHeight": 25132406,
       "extra": {
         "memo": "0",
@@ -63,10 +63,10 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
     },
     {
       "accountId": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer",
-      "blockHash": "",
+      "blockHash": null,
       "blockHeight": 25132352,
       "extra": {
-        "memo": "3544580464453892767",
+        "memo": "3544580464453892600",
       },
       "fee": "10000",
       "hash": "8ee53474525de27a357f728d1486c7cc6cead11bb4025b62f2154b4d7652789b",
@@ -82,7 +82,7 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
     },
     {
       "accountId": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer",
-      "blockHash": "",
+      "blockHash": null,
       "blockHeight": 25132338,
       "extra": {
         "memo": "0",
@@ -101,7 +101,7 @@ exports[`internet_computer currency bridge scanAccounts internet_computer seed 1
     },
     {
       "accountId": "js:2:internet_computer:046f08828871028b6e3cb5c13b2e2a8fa6e93f0b3ca7379171f6b7b45877955a2430925f76ec69ccb3cd8738859a8e29dcd0f9a357f1d009d2b497c6c8f63aa7cf:internet_computer",
-      "blockHash": "",
+      "blockHash": null,
       "blockHeight": 5432782,
       "extra": {
         "memo": "0",

package/src/featureFlags/defaultFeatures.ts

@@ -33,6 +33,7 @@ export const initFeature = <T>(opts?: Feature<T>) => {
  * Currency Features.
  */
 export const CURRENCY_DEFAULT_FEATURES = {
+  currencyPolkadot: { enabled: true },
   currencyArbitrum: DEFAULT_FEATURE,
   currencyArbitrumSepolia: DEFAULT_FEATURE,
   currencyAstar: DEFAULT_FEATURE,
@@ -687,7 +688,6 @@ export const DEFAULT_FEATURES: Features = {
   llmHomescreen: DEFAULT_FEATURE,
   supportDeviceApex: DEFAULT_FEATURE,
   llmSyncOnboardingIncr1: DEFAULT_FEATURE,
-  lldSyncOnboardingIncr1: DEFAULT_FEATURE,
   noah: DEFAULT_FEATURE,
 };
 

package/src/load/speculos.ts

@@ -128,7 +128,6 @@ export const findLatestAppCandidate = (
   appCandidates: AppCandidate[],
   search: AppSearch,
 ): AppCandidate | null => {
-  search.firmware = process.env.SPECULOS_FIRMWARE_VERSION;
   let apps = appCandidates.filter(c => appCandidatesMatches(c, search));
   if (apps.length === 0) {
     return null;

package/src/modularDrawer/hooks/index.ts

@@ -1,2 +1 @@
 export { useDetailedAccountsCore } from "./useDetailedAccountsCore";
-export { useAcceptedCurrency } from "./useAcceptedCurrency";

package/src/modularDrawer/hooks/{useNetworkAccountCounts.tsx → useAssetAccountCounts.tsx}

@@ -5,27 +5,26 @@ import type { Account } from "@ledgerhq/types-live";
 import { WalletAPIAccount } from "../../wallet-api/types";
 
 type AccountModuleParams = {
-  networks: CryptoOrTokenCurrency[];
+  assets: CryptoOrTokenCurrency[];
   nestedAccounts: Account[];
   accountIds: Map<string, boolean> | undefined;
   formatLabel: (count: number) => string;
   accounts$?: Observable<WalletAPIAccount[]>;
 };
 
-export type NetworkCountItem = {
+export type AssetCountItem = {
   asset: CryptoOrTokenCurrency;
   label: string;
   count: number;
 };
 
-export const useNetworkAccountCounts = ({
-  networks,
+export const useAssetAccountCounts = ({
+  assets,
   nestedAccounts,
   accountIds,
   formatLabel,
-}: AccountModuleParams): NetworkCountItem[] =>
-  networks.map(network => {
-    const asset = network.type === "TokenCurrency" ? network.parentCurrency : network;
+}: AccountModuleParams): AssetCountItem[] =>
+  assets.map(asset => {
     const { length } = getAccountTuplesForCurrency(asset, nestedAccounts, accountIds);
     return {
       asset,

package/src/modularDrawer/hooks/useCurrenciesUnderFeatureFlag.ts

@@ -76,6 +76,7 @@ export function useCurrenciesUnderFeatureFlag() {
   const westend = useFeature("currencyWestend");
   const assetHubWestend = useFeature("currencyAssetHubWestend");
   const assetHubPolkadot = useFeature("currencyAssetHubPolkadot");
+  const polkadot = useFeature("currencyPolkadot");
 
   const featureFlaggedCurrencies = useMemo(
     (): Partial<Record<CryptoCurrencyId, Feature<unknown> | null>> => ({
@@ -148,6 +149,7 @@ export function useCurrenciesUnderFeatureFlag() {
       westend,
       assethub_westend: assetHubWestend,
       assethub_polkadot: assetHubPolkadot,
+      polkadot,
     }),
     [
       aptos,
@@ -219,6 +221,7 @@ export function useCurrenciesUnderFeatureFlag() {
       westend,
       assetHubWestend,
       assetHubPolkadot,
+      polkadot,
     ],
   );
 

package/src/modularDrawer/hooks/useLeftAccounts.tsx

@@ -1,5 +1,6 @@
+import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { ReactNode } from "react";
-import { AccountModuleParams, AccountDataItem, NetworkWithCount } from "../utils/type";
+import { AccountModuleParams, AccountDataItem } from "../utils/type";
 
 export const createUseLeftAccountsModule = ({
   useAccountData,
@@ -8,10 +9,13 @@ export const createUseLeftAccountsModule = ({
   useAccountData: (params: AccountModuleParams) => AccountDataItem[];
   accountsCount: (args: { label: string }) => ReactNode;
 }) => {
-  return function useLeftAccountsModule(params: AccountModuleParams): Array<NetworkWithCount> {
+  return function useLeftAccountsModule(
+    params: AccountModuleParams,
+  ): Array<CryptoOrTokenCurrency & { leftElement?: ReactNode; count: number }> {
     const accountData = useAccountData(params);
 
-    return accountData.map(({ label, count }) => ({
+    return accountData.map(({ asset, label, count }) => ({
+      ...asset,
       leftElement: count > 0 ? accountsCount({ label }) : undefined,
       count,
     }));

package/src/modularDrawer/hooks/useLeftAccountsApy.tsx

@@ -5,14 +5,15 @@ import {
   NetworkWithCount,
 } from "../utils/type";
 import { useInterestRatesByCurrencies } from "../../dada-client/hooks/useInterestRatesByCurrencies";
+import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { getInterestRateForAsset } from "../utils/getInterestRateForAsset";
 
 export function useLeftAccountsApyModule(
   params: AccountModuleParams,
   useAccountData: (params: AccountModuleParams) => AccountDataItem[],
   accountsCountAndApy: CreateAccountsCountAndApy,
-): Array<NetworkWithCount> {
-  const { networks } = params;
+  networks: CryptoOrTokenCurrency[],
+): NetworkWithCount[] {
   const accountData = useAccountData(params);
   const interestRates = useInterestRatesByCurrencies(networks);
 
@@ -26,10 +27,12 @@ export function useLeftAccountsApyModule(
 
     if ((!interestRate || interestRatePercentageRounded <= 0) && count <= 0) {
       return {
+        ...asset,
         count,
       };
     }
     return {
+      ...asset,
       leftElement: accountsCountAndApy({
         label: count > 0 ? label : undefined,
         value: interestRatePercentageRounded,

package/src/modularDrawer/hooks/useRightBalanceNetwork.tsx

@@ -1,5 +1,5 @@
 import type { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
-import { UseBalanceDeps, CreateBalanceItem, BalanceUI } from "../utils/type";
+import { UseBalanceDeps, CreateBalanceItem } from "../utils/type";
 import { getBalanceAndFiatValueByAssets } from "../utils/getBalanceAndFiatValueByAssets";
 import BigNumber from "bignumber.js";
 
@@ -13,10 +13,7 @@ type Params = {
 };
 
 export function createUseRightBalanceNetwork({ useBalanceDeps, balanceItem }: NetworkDeps) {
-  return function useRightBalanceNetwork({ networks }: Params): Array<{
-    rightElement?: React.ReactNode;
-    balanceData?: BalanceUI;
-  }> {
+  return function useRightBalanceNetwork({ networks }: Params) {
     const { flattenedAccounts, state, counterValueCurrency } = useBalanceDeps();
 
     const networkBalanceData = getBalanceAndFiatValueByAssets(
@@ -37,6 +34,7 @@ export function createUseRightBalanceNetwork({ useBalanceDeps, balanceItem }: Ne
       };
 
       return {
+        ...currency,
         rightElement: balanceItem(balanceData),
         balanceData,
       };