@ledgerhq/live-common 34.49.0-nightly.1 → 34.49.0-nightly.2

package/src/account/formatters.ts

@@ -4,24 +4,15 @@ import {
   getOperationAmountNumber,
   getOperationAmountNumberWithInternals,
 } from "@ledgerhq/coin-framework/operation";
-import { nftsByCollections } from "@ledgerhq/live-nft";
 import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 import type { Unit } from "@ledgerhq/types-cryptoassets";
-import type { Account, Operation, ProtoNFT } from "@ledgerhq/types-live";
+import type { Account, Operation } from "@ledgerhq/types-live";
 import { BigNumber } from "bignumber.js";
 import invariant from "invariant";
 import { formatCurrencyUnit } from "../currencies";
 import { toAccountRaw } from "./serialization";
 import { getAccountBridge } from "../bridge";
 
-const styling = {
-  bold: (str: string) => `\x1b[1m${str}\x1b[22m`,
-  underline: (str: string) => `\x1b[4m${str}\x1b[24m`,
-  cyan: (str: string) => `\x1b[36m${str}\x1b[37m`,
-  magenta: (str: string) => `\x1b[35m${str}\x1b[37m`,
-  reverse: (str: string) => `\x1b[7m${str}\x1b[27m`,
-};
-
 const isSignificantAccount = acc =>
   acc.balance.gt(10 ** (getAccountCurrency(acc).units[0].magnitude - 6));
 
@@ -77,8 +68,7 @@ function maybeDisplaySumOfOpsIssue(ops, balance, unit) {
 }
 
 const cliFormat = (account, level?: string) => {
-  const { id, name, freshAddress, freshAddressPath, derivationMode, index, operations, nfts } =
-    account;
+  const { id, name, freshAddress, freshAddressPath, derivationMode, index, operations } = account;
   const tag = getTagDerivationMode(account.currency, derivationMode);
   const balance = formatCurrencyUnit(getAccountCurrency(account).units[0], account.balance, {
     showCode: true,
@@ -122,34 +112,6 @@ const cliFormat = (account, level?: string) => {
     )
     .join("\n");
 
-  if (nfts?.length) {
-    const NFTCollections = nftsByCollections(nfts);
-
-    str += "\n";
-    str += `NFT Collections (${Object.keys(NFTCollections).length}) `;
-    str += "\n";
-
-    str += Object.entries(NFTCollections)
-      .map(([contract, nfts]: [string, ProtoNFT[]]) => {
-        const tokenName = nfts?.[0]?.metadata?.tokenName;
-        const { bold, magenta, cyan, reverse } = styling;
-
-        return (
-          `${bold(tokenName ?? "Unknown Collection Name")} (${magenta(contract)}): ` +
-          nfts
-            .map(t =>
-              t?.metadata?.nftName
-                ? `\n  ${t.amount}x ${reverse(` ${t?.metadata?.nftName} `)} ${cyan(
-                    "#" + t.tokenId,
-                  )}`
-                : `\n  ${t.amount}x ${cyan("#" + t.tokenId)}`,
-            )
-            .join()
-        );
-      })
-      .join("\n");
-  }
-
   if (level === "basic") return str;
   str += "\nOPERATIONS (" + operations.length + ")";
   str += operations

package/src/customImage/errors.ts

@@ -4,16 +4,12 @@ export const ImageLoadFromGalleryError = createCustomErrorClass("ImageLoadFromGa
 
 export const ImageLoadFromFileError = createCustomErrorClass("ImageLoadFromFileError");
 
-export const ImageLoadFromNftError = createCustomErrorClass("ImageLoadFromNftError");
-
 export const ImageIncorrectFileTypeError = createCustomErrorClass("ImageIncorrectFileTypeError");
 
 export const ImageDownloadError = createCustomErrorClass("ImageDownloadError");
 
 export const ImageTooLargeError = createCustomErrorClass("ImageTooLargeError");
 
-export const NFTMetadataLoadingError = createCustomErrorClass("NFTMetadataLoadingError");
-
 export const ImageSizeLoadingError = createCustomErrorClass("ImageSizeLoadingError");
 
 export const ImageCropError = createCustomErrorClass("ImageCropError");

package/src/deposit/type.ts

@@ -25,6 +25,7 @@ export type GroupedCurrency = {
 export type CurrenciesByProviderId = {
   currenciesByNetwork: CryptoOrTokenCurrency[];
   providerId: string;
+  metaCurrencyId?: string;
 };
 
 export type GroupedCurrencies = {

package/src/exchange/providers/swap.ts

@@ -226,7 +226,8 @@ const DEFAULT_SWAP_PROVIDERS: Record<string, ProviderConfig & Partial<Additional
 };
 
 export const dexProvidersContractAddress: { [key: string]: string } = {
-  "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD": "Uniswap",
+  "0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad": "Uniswap",
+  "0x111111125421ca6dc452d289314280a0f8842a65": "1inch",
 };
 
 export const termsOfUse: { [key: string]: string } = {

package/src/featureFlags/defaultFeatures.ts

@@ -111,6 +111,7 @@ export const DEFAULT_FEATURES: Features = {
   ptxServiceCtaExchangeDrawer: DEFAULT_FEATURE,
   ptxServiceCtaScreens: DEFAULT_FEATURE,
   ptxSwapReceiveTRC20WithoutTrx: DEFAULT_FEATURE,
+  ptxSwapconfirmSwapOnDevice: DEFAULT_FEATURE,
   disableNftLedgerMarket: DEFAULT_FEATURE,
   disableNftRaribleOpensea: DEFAULT_FEATURE,
   disableNftSend: DEFAULT_FEATURE,
@@ -492,7 +493,6 @@ export const DEFAULT_FEATURES: Features = {
       refreshTime: 3, //nb minutes
     },
   },
-  spamReportNfts: DEFAULT_FEATURE,
   lldWalletSync: {
     ...DEFAULT_FEATURE,
     params: {
@@ -592,8 +592,6 @@ export const DEFAULT_FEATURES: Features = {
   },
   llmThai: DEFAULT_FEATURE,
   lldThai: DEFAULT_FEATURE,
-  lldSolanaNfts: DEFAULT_FEATURE,
-  llmSolanaNfts: DEFAULT_FEATURE,
   largemoverLandingpage: DEFAULT_FEATURE,
   llmMmkvMigration: {
     ...DEFAULT_FEATURE,
@@ -629,7 +627,6 @@ export const DEFAULT_FEATURES: Features = {
       backendEnvironment: "PROD",
     },
   },
-  llNftSupport: DEFAULT_FEATURE,
   llNftEntryPoint: {
     ...DEFAULT_FEATURE,
     params: {

package/src/modularDrawer/__mocks__/dada.mock.ts

@@ -1,6 +1,7 @@
 export const expectedAssetsSorted = [
   {
     id: "bitcoin",
+    metaCurrencyId: "bitcoin",
     ticker: "BTC",
     name: "Bitcoin",
     assetsIds: {
@@ -9,6 +10,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "ethereum",
+    metaCurrencyId: "urn:crypto:meta-currency:ethereum",
     ticker: "ETH",
     name: "Ethereum",
     assetsIds: {
@@ -26,6 +28,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "ripple",
+    metaCurrencyId: "ripple",
     ticker: "XRP",
     name: "Ripple",
     assetsIds: {
@@ -34,6 +37,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "ethereum/erc20/usd_tether__erc20_",
+    metaCurrencyId: "urn:crypto:meta-currency:tether",
     ticker: "USDT",
     name: "Tether USD",
     assetsIds: {
@@ -57,6 +61,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "bsc",
+    metaCurrencyId: "urn:crypto:meta-currency:binancecoin",
     ticker: "BNB",
     name: "Binance Smart Chain",
     assetsIds: {
@@ -67,6 +72,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "solana",
+    metaCurrencyId: "solana",
     ticker: "SOL",
     name: "Solana",
     assetsIds: {
@@ -75,6 +81,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "ethereum/erc20/usd__coin",
+    metaCurrencyId: "urn:crypto:meta-currency:usd_coin",
     ticker: "USDC",
     name: "USD Coin",
     assetsIds: {
@@ -104,6 +111,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "ethereum/erc20/steth",
+    metaCurrencyId: "ethereum/erc20/steth",
     ticker: "stETH",
     name: "LIDO Staked ETH",
     assetsIds: {
@@ -112,6 +120,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "tron",
+    metaCurrencyId: "tron",
     ticker: "TRX",
     name: "Tron",
     assetsIds: {
@@ -120,6 +129,7 @@ export const expectedAssetsSorted = [
   },
   {
     id: "dogecoin",
+    metaCurrencyId: "dogecoin",
     ticker: "DOGE",
     name: "Dogecoin",
     assetsIds: {