@ledgerhq/live-common 34.52.0-nightly.4 → 34.52.0-nightly.6

package/src/e2e/data/deviceLabelsData.ts

@@ -66,10 +66,11 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       default: DeviceLabels.CAPS_APPROVE,
     },
     sendVerify: {
+      [AppInfos.SOLANA.name]: DeviceLabels.TRANSFER,
       default: DeviceLabels.REVIEW_OPERATION,
     },
     sendConfirm: {
-      [AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
+      [AppInfos.SOLANA.name]: DeviceLabels.APPROVE,
       [AppInfos.TRON.name]: DeviceLabels.SIGN,
       [AppInfos.STELLAR.name]: DeviceLabels.SIGN,
       [AppInfos.RIPPLE.name]: DeviceLabels.SIGN,
@@ -114,7 +115,7 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.VERIFY_ETHEREUM,
       [AppInfos.POLKADOT.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.POLYGON.name]: DeviceLabels.VERIFY_POLYGON,
-      [AppInfos.SOLANA.name]: DeviceLabels.PUBKEY,
+      [AppInfos.SOLANA.name]: DeviceLabels.VERIFY_SOLANA_ADDRESS,
       default: DeviceLabels.ADDRESS,
     },
     receiveConfirm: {
@@ -124,13 +125,14 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.ETHEREUM.name]: DeviceLabels.CONFIRM,
       [AppInfos.POLKADOT.name]: DeviceLabels.CAPS_APPROVE,
       [AppInfos.POLYGON.name]: DeviceLabels.CONFIRM,
+      [AppInfos.SOLANA.name]: DeviceLabels.CONFIRM,
       default: DeviceLabels.APPROVE,
     },
     delegateVerify: {
       [AppInfos.COSMOS.name]: DeviceLabels.PLEASE_REVIEW,
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.RECEIVER,
       [AppInfos.NEAR.name]: DeviceLabels.VIEW_HEADER,
-      [AppInfos.SOLANA.name]: DeviceLabels.DELEGATE_FROM,
+      [AppInfos.SOLANA.name]: DeviceLabels.REVIEW_TRANSACTION_TO,
       default: DeviceLabels.REVIEW_OPERATION,
     },
     delegateConfirm: {
@@ -141,15 +143,16 @@ export const DEVICE_LABELS_CONFIG: DeviceLabelsConfig = {
       [AppInfos.MULTIVERS_X.name]: DeviceLabels.SIGN,
       [AppInfos.NEAR.name]: DeviceLabels.CONTINUE_TO_ACTION,
       [AppInfos.OSMOSIS.name]: DeviceLabels.CAPS_APPROVE,
+      [AppInfos.SOLANA.name]: DeviceLabels.SIGN,
       default: DeviceLabels.APPROVE,
     },
     sendVerify: {
-      [AppInfos.SOLANA.name]: DeviceLabels.TRANSFER,
+      [AppInfos.SOLANA.name]: DeviceLabels.REVIEW_TRANSACTION_TO,
       [AppInfos.RIPPLE.name]: DeviceLabels.TRANSACTION_TYPE,
       default: DeviceLabels.REVIEW_OPERATION,
     },
     sendConfirm: {
-      [AppInfos.SOLANA.name]: DeviceLabels.APPROVE,
+      [AppInfos.SOLANA.name]: DeviceLabels.SIGN_TRANSACTION,
       [AppInfos.TRON.name]: DeviceLabels.SIGN,
       [AppInfos.STELLAR.name]: DeviceLabels.SIGN,
       [AppInfos.RIPPLE.name]: DeviceLabels.SIGN,

package/src/e2e/enum/DeviceLabels.ts

@@ -39,6 +39,7 @@ export enum DeviceLabels {
   REVIEW_OPERATION = "Review",
   REMOVE_PHONE_OR_COMPUTER = "Remove phone or computer",
   REVIEW_TRANSACTION = "Review transaction",
+  REVIEW_TRANSACTION_TO = "Review transaction to",
   SEND = "Send",
   SEND_TO_ADDRESS = "Send to address",
   SEND_TO_ADDRESS_2 = "Send to address (2/2)",

package/src/e2e/families/solana.ts

@@ -22,10 +22,7 @@ export async function sendSolana(tx: Transaction) {
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
   if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
-    const isAddressCorrect = containsSubstringInEvent(
-      tx.accountToCredit.parentAccount?.address ?? tx.accountToCredit.address,
-      events,
-    );
+    const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
   }
 

package/src/families/canton/bridge/mock.ts

@@ -1,6 +1,6 @@
 import { makeLRUCache, minutes } from "@ledgerhq/live-network/cache";
 import { createApi } from "@ledgerhq/coin-canton/api/index";
-import { Transaction as CantonTransaction } from "@ledgerhq/coin-canton/types";
+import { Transaction as CantonTransaction, CantonAccount } from "@ledgerhq/coin-canton/types";
 import type { AccountBridge } from "@ledgerhq/types-live";
 import { BigNumber } from "bignumber.js";
 
@@ -51,12 +51,12 @@ const getTransactionStatus = async (): Promise<any> => {
   };
 };
 
-const estimateMaxSpendable = ({ account }: { account: any }): Promise<BigNumber> => {
+const estimateMaxSpendable = ({ account }: { account: CantonAccount }): Promise<BigNumber> => {
   return Promise.resolve(account.balance || new BigNumber(0));
 };
 
 const prepareTransaction = async (
-  _account: any,
+  _account: CantonAccount,
   transaction: CantonTransaction,
 ): Promise<CantonTransaction> => {
   return {
@@ -65,17 +65,17 @@ const prepareTransaction = async (
   };
 };
 
-const sync = (_initialAccount: any): any => {
+const sync = (_initialAccount: CantonAccount): any => {
   return {
     subscribe: (observer: any) => {
-      observer.next((acc: any) => acc);
+      observer.next((acc: CantonAccount) => acc);
       observer.complete();
       return { unsubscribe: () => {} };
     },
   };
 };
 
-const receive = (_account: any, _opts: { deviceId: string }): any => {
+const receive = (_account: CantonAccount, _opts: { deviceId: string }): any => {
   return {
     subscribe: (observer: any) => {
       observer.next({
@@ -144,6 +144,9 @@ const scanAccounts = (): any => {
           lastSyncDate: new Date(),
           operations: [],
           pendingOperations: [],
+          cantonResources: {
+            instrumentUtxoCounts: {},
+          },
         },
       });
       observer.complete();
@@ -156,7 +159,7 @@ const getSerializedAddressParameters = (): Buffer => {
   return Buffer.from("mock-address-params");
 };
 
-const accountBridge: AccountBridge<CantonTransaction> = {
+const accountBridge: AccountBridge<CantonTransaction, CantonAccount> = {
   createTransaction,
   updateTransaction,
   getTransactionStatus,

package/src/families/canton/setup.ts

@@ -5,10 +5,10 @@ import { getEnv } from "@ledgerhq/live-env";
 import Transport from "@ledgerhq/hw-transport";
 import { CantonSigner } from "@ledgerhq/coin-canton";
 import cantonResolver from "@ledgerhq/coin-canton/signer";
-import type { Account, Bridge } from "@ledgerhq/types-live";
+import type { Bridge } from "@ledgerhq/types-live";
 import makeCliTools from "@ledgerhq/coin-canton/test/cli";
 import { CantonCoinConfig } from "@ledgerhq/coin-canton/config";
-import { TransactionStatus, Transaction } from "@ledgerhq/coin-canton/types";
+import { TransactionStatus, Transaction, CantonAccount } from "@ledgerhq/coin-canton/types";
 import { LegacySignerCanton } from "@ledgerhq/live-signer-canton";
 import { CreateSigner, createResolver, executeWithSigner } from "../../bridge/setup";
 import cantonBridgeMock from "./bridge/mock";
@@ -27,7 +27,7 @@ const getCurrencyConfig = (currency?: CryptoCurrency) => {
   return getCurrencyConfiguration<CantonCoinConfig>(currency);
 };
 
-const bridge: Bridge<Transaction, Account, TransactionStatus> = getEnv("MOCK")
+const bridge: Bridge<Transaction, CantonAccount, TransactionStatus> = getEnv("MOCK")
   ? cantonBridgeMock
   : createBridges(executeWithSigner(createSigner), getCurrencyConfig);
 

package/src/families/evm/config.ts

@@ -925,6 +925,23 @@ const evmConfig: CurrencyLiveConfigDefinition = {
       showNfts: false,
     },
   },
+  config_currency_monad: {
+    type: "object",
+    default: {
+      status: {
+        type: "active",
+      },
+      node: {
+        type: "external",
+        uri: "https://rpc.monad.xyz",
+      },
+      explorer: {
+        type: "etherscan",
+        uri: "https://proxyetherscan.api.live.ledger.com/v2/api/143",
+      },
+      showNfts: false,
+    },
+  },
 };
 
 export { evmConfig };