From 2629450f33555f8cfdc2912d62658789b4699c2f Mon Sep 17 00:00:00 2001 From: Alexandre Chabrolin <9203826+chabroA@users.noreply.github.com> Date: Fri, 11 Aug 2023 13:02:11 +0200 Subject: [PATCH 01/11] add platform and wallet-api adapters to evm family --- .../Web3AppWebview/liveSDKLogic.test.ts | 30 ++--- .../components/Web3AppWebview/liveSDKLogic.ts | 2 +- .../families/bitcoin/walletApiAdapter.test.ts | 15 +-- .../src/families/bitcoin/walletApiAdapter.ts | 8 +- .../ethereum/walletApiAdapter.test.ts | 15 +-- .../src/families/ethereum/walletApiAdapter.ts | 23 +--- .../src/families/evm/platformAdapter.ts | 48 ++++++++ .../src/families/evm/walletApiAdapter.test.ts | 69 ++++++++++++ .../src/families/evm/walletApiAdapter.ts | 55 ++++++++++ .../polkadot/walletApiAdapter.test.ts | 15 +-- .../src/families/polkadot/walletApiAdapter.ts | 6 +- .../families/ripple/walletApiAdapter.test.ts | 15 +-- .../src/families/ripple/walletApiAdapter.ts | 2 +- .../src/generated/platformAdapter.ts | 2 + .../src/generated/walletApiAdapter.ts | 2 + .../src/mock/fixtures/cryptoCurrencies.ts | 4 +- .../src/platform/converters.test.ts | 2 +- .../src/platform/converters.ts | 13 ++- .../src/platform/logic.test.ts | 103 +++++++++--------- libs/ledger-live-common/src/platform/logic.ts | 5 +- .../src/wallet-api/converters.test.ts | 10 +- .../src/wallet-api/converters.ts | 8 +- .../src/wallet-api/logic.test.ts | 18 +-- .../src/wallet-api/logic.ts | 13 +-- .../src/wallet-api/types.ts | 11 +- 25 files changed, 309 insertions(+), 185 deletions(-) create mode 100644 libs/ledger-live-common/src/families/evm/platformAdapter.ts create mode 100644 libs/ledger-live-common/src/families/evm/walletApiAdapter.test.ts create mode 100644 libs/ledger-live-common/src/families/evm/walletApiAdapter.ts diff --git a/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.test.ts b/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.test.ts index 966588908bbe..26b99364ac3b 100644 --- a/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.test.ts +++ b/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.test.ts @@ -7,6 +7,7 @@ import { } from "@ledgerhq/types-cryptoassets"; import { Account, TokenAccount } from "@ledgerhq/types-live"; import { Transaction } from "@ledgerhq/live-common/generated/types"; +import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/index"; import prepareSignTransaction from "./liveSDKLogic"; @@ -19,25 +20,24 @@ describe("prepareSignTransaction", () => { it("returns a Transaction", () => { // Given const parentAccount = createAccount("12"); - const childAccount = createTokenAccount("22", "ethereumjs:2:ethereum:0x012:"); - const expectedResult = { + const childAccount = createTokenAccount("22", "js:2:ethereum:0x012:"); + const expectedResult: EvmTransaction = { amount: new BigNumber("1000"), data: Buffer.from([]), - estimatedGasLimit: null, - family: "ethereum", - feeCustomUnit: { code: "Gwei", magnitude: 9, name: "Gwei" }, + family: "evm", feesStrategy: "medium", gasPrice: new BigNumber("700000"), gasLimit: new BigNumber("1200000"), - userGasLimit: new BigNumber("1200000"), + customGasLimit: new BigNumber("1200000"), mode: "send", - networkInfo: null, nonce: 8, recipient: "0x0123456", - subAccountId: "ethereumjs:2:ethereum:0x022:", + subAccountId: "js:2:ethereum:0x022:", useAllAmount: false, - maxFeePerGas: null, - maxPriorityFeePerGas: null, + maxFeePerGas: undefined, + maxPriorityFeePerGas: undefined, + type: 1, + chainId: 0, }; // When @@ -51,7 +51,7 @@ describe("prepareSignTransaction", () => { // *** UTIL FUNCTIONS *** function createEtherumTransaction(): Partial { return { - family: "ethereum", + family: "evm", amount: new BigNumber("1000"), recipient: "0x0123456", nonce: 8, @@ -68,7 +68,7 @@ const createCryptoCurrency = (family: string): CryptoCurrency => ({ name: "ethereum", managerAppName: "ethereum", ticker: "MYC", - scheme: "ethereum", + scheme: "evm", color: "#ff0000", family, units: [ @@ -92,10 +92,10 @@ const createCryptoCurrency = (family: string): CryptoCurrency => ({ ], }); -const defaultEthCryptoFamily = createCryptoCurrency("ethereum"); +const defaultEthCryptoFamily = createCryptoCurrency("evm"); const createAccount = (id: string, crypto: CryptoCurrency = defaultEthCryptoFamily): Account => ({ type: "Account", - id: `ethereumjs:2:ethereum:0x0${id}:`, + id: `js:2:ethereum:0x0${id}:`, seedIdentifier: "0x01", derivationMode: "ethM", index: 0, @@ -139,7 +139,7 @@ const createAccount = (id: string, crypto: CryptoCurrency = defaultEthCryptoFami function createTokenAccount(id = "32", parentId = "whatever"): TokenAccount { return { type: "TokenAccount", - id: `ethereumjs:2:ethereum:0x0${id}:`, + id: `js:2:ethereum:0x0${id}:`, parentId, token: createTokenCurrency(), balance: new BigNumber(0), diff --git a/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.ts b/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.ts index 635463916f1b..c28ce55a3dab 100644 --- a/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.ts +++ b/apps/ledger-live-mobile/src/components/Web3AppWebview/liveSDKLogic.ts @@ -18,7 +18,7 @@ export default function prepareSignTransaction( }); return bridge.updateTransaction(t2, { - userGasLimit: txData.gasLimit, + customGasLimit: txData.gasLimit, ...txData, }); } diff --git a/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.test.ts b/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.test.ts index 9f6bef58af42..1b597215e8cb 100644 --- a/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.test.ts +++ b/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.test.ts @@ -1,12 +1,9 @@ import btc from "./walletApiAdapter"; import { BitcoinTransaction as WalletAPITransaction } from "@ledgerhq/wallet-api-core"; -import { Account } from "@ledgerhq/types-live"; import BigNumber from "bignumber.js"; import { Transaction } from "./types"; describe("getPlatformTransactionSignFlowInfos", () => { - const dummyAccount = {} as Account; - describe("should properly get infos for BTC platform tx", () => { test("without fees provided", () => { const btcPlatformTx: WalletAPITransaction = { @@ -21,10 +18,8 @@ describe("getPlatformTransactionSignFlowInfos", () => { recipient: btcPlatformTx.recipient, }; - const { canEditFees, hasFeesProvided, liveTx } = btc.getWalletAPITransactionSignFlowInfos({ - tx: btcPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + btc.getWalletAPITransactionSignFlowInfos(btcPlatformTx); expect(canEditFees).toBe(true); @@ -49,10 +44,8 @@ describe("getPlatformTransactionSignFlowInfos", () => { feesStrategy: null, }; - const { canEditFees, hasFeesProvided, liveTx } = btc.getWalletAPITransactionSignFlowInfos({ - tx: btcPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + btc.getWalletAPITransactionSignFlowInfos(btcPlatformTx); expect(canEditFees).toBe(true); diff --git a/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.ts b/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.ts index a9acc1480f39..aaac226dca64 100644 --- a/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.ts +++ b/libs/ledger-live-common/src/families/bitcoin/walletApiAdapter.ts @@ -13,7 +13,7 @@ const areFeesProvided: AreFeesProvided = tx => !!tx const convertToLiveTransaction: ConvertToLiveTransaction< WalletAPIBitcoinTransaction, Transaction -> = ({ tx }) => { +> = tx => { const hasFeesProvided = areFeesProvided(tx); const liveTx: Partial = { @@ -29,11 +29,11 @@ const convertToLiveTransaction: ConvertToLiveTransaction< const getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos< WalletAPIBitcoinTransaction, Transaction -> = params => { +> = tx => { return { canEditFees: CAN_EDIT_FEES, - liveTx: convertToLiveTransaction(params), - hasFeesProvided: areFeesProvided(params.tx), + liveTx: convertToLiveTransaction(tx), + hasFeesProvided: areFeesProvided(tx), }; }; diff --git a/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.test.ts b/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.test.ts index bf94d37ebb35..25d0c3033412 100644 --- a/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.test.ts +++ b/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.test.ts @@ -1,13 +1,10 @@ import { EthereumTransaction as WalletAPITransaction } from "@ledgerhq/wallet-api-core"; -import { Account } from "@ledgerhq/types-live"; import BigNumber from "bignumber.js"; import eth from "./walletApiAdapter"; import { Transaction } from "./types"; describe("getPlatformTransactionSignFlowInfos", () => { describe("should properly get infos for ETH platform tx", () => { - const dummyAccount = { currency: { family: "ethereum" } } as Account; - test("without fees provided", () => { const ethPlatformTx: WalletAPITransaction = { family: "ethereum", @@ -21,10 +18,8 @@ describe("getPlatformTransactionSignFlowInfos", () => { recipient: ethPlatformTx.recipient, }; - const { canEditFees, hasFeesProvided, liveTx } = eth.getWalletAPITransactionSignFlowInfos({ - tx: ethPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + eth.getWalletAPITransactionSignFlowInfos(ethPlatformTx); expect(canEditFees).toBe(true); @@ -51,10 +46,8 @@ describe("getPlatformTransactionSignFlowInfos", () => { feesStrategy: "custom", }; - const { canEditFees, hasFeesProvided, liveTx } = eth.getWalletAPITransactionSignFlowInfos({ - tx: ethPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + eth.getWalletAPITransactionSignFlowInfos(ethPlatformTx); expect(canEditFees).toBe(true); diff --git a/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.ts b/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.ts index 7ed7bf84c12f..63645695c106 100644 --- a/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.ts +++ b/libs/ledger-live-common/src/families/ethereum/walletApiAdapter.ts @@ -1,5 +1,4 @@ import { EthereumTransaction as WalletAPIEthereumTransaction } from "@ledgerhq/wallet-api-core"; -import { Account } from "@ledgerhq/types-live"; import { Transaction as EvmTx } from "@ledgerhq/coin-evm/types/index"; import { AreFeesProvided, @@ -7,7 +6,6 @@ import { GetWalletAPITransactionSignFlowInfos, } from "../../wallet-api/types"; import { Transaction as EthTx } from "./types"; -import { isTokenAccount } from "../../account"; const CAN_EDIT_FEES = true; @@ -19,21 +17,10 @@ const areFeesProvided: AreFeesProvided = tx => const convertToLiveTransaction: ConvertToLiveTransaction< WalletAPIEthereumTransaction, Transaction -> = ({ tx, account, parentAccount }) => { +> = tx => { const hasFeesProvided = areFeesProvided(tx); - const accountFamily = isTokenAccount(account) - ? (parentAccount as Account).currency.family - : account.currency.family; - const { gasLimit, ...restTx } = tx; - - const liveTx: Partial = - accountFamily === "ethereum" - ? { - ...restTx, - userGasLimit: gasLimit, - } - : convertToEvmLiveTransaction(tx); + const liveTx: Partial = convertToEvmLiveTransaction(tx); return hasFeesProvided ? { ...liveTx, feesStrategy: "custom" } : liveTx; }; @@ -41,11 +28,11 @@ const convertToLiveTransaction: ConvertToLiveTransaction< const getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos< WalletAPIEthereumTransaction, Transaction -> = params => { +> = tx => { return { canEditFees: CAN_EDIT_FEES, - liveTx: convertToLiveTransaction(params), - hasFeesProvided: areFeesProvided(params.tx), + liveTx: convertToLiveTransaction(tx), + hasFeesProvided: areFeesProvided(tx), }; }; diff --git a/libs/ledger-live-common/src/families/evm/platformAdapter.ts b/libs/ledger-live-common/src/families/evm/platformAdapter.ts new file mode 100644 index 000000000000..6c24562d5d90 --- /dev/null +++ b/libs/ledger-live-common/src/families/evm/platformAdapter.ts @@ -0,0 +1,48 @@ +// TODO: to remove once live-app-sdk is depreciated and removed from LL + +import { EthereumTransaction as PlatformTransaction } from "@ledgerhq/live-app-sdk"; +import { Transaction } from "@ledgerhq/coin-evm/types/index"; + +const CAN_EDIT_FEES = true; + +const areFeesProvided = (tx: PlatformTransaction): boolean => !!(tx.gasLimit || tx.gasPrice); + +const convertToLiveTransaction = (tx: PlatformTransaction): Partial => { + const hasFeesProvided = areFeesProvided(tx); + + const liveTx: Partial = { + ...tx, + family: "evm" as const, + nonce: tx.nonce, + amount: tx.amount, + recipient: tx.recipient, + data: tx.data, + gasLimit: tx.gasLimit, + feesStrategy: hasFeesProvided ? ("custom" as const) : undefined, + customGasLimit: hasFeesProvided ? tx.gasLimit : undefined, + // live-app-sdk does not handle type 2 for ethereum transactions + // cf. `EthereumTransaction` type (`PlatformTransaction`), does not have + // `maxPriorityFeePerGas` or `maxFeePerGas` properties + type: 0, + maxFeePerGas: undefined, + maxPriorityFeePerGas: undefined, + }; + + return liveTx; +}; + +const getPlatformTransactionSignFlowInfos = ( + tx: PlatformTransaction, +): { + canEditFees: boolean; + hasFeesProvided: boolean; + liveTx: Partial; +} => { + return { + canEditFees: CAN_EDIT_FEES, + liveTx: convertToLiveTransaction(tx), + hasFeesProvided: areFeesProvided(tx), + }; +}; + +export default { getPlatformTransactionSignFlowInfos }; diff --git a/libs/ledger-live-common/src/families/evm/walletApiAdapter.test.ts b/libs/ledger-live-common/src/families/evm/walletApiAdapter.test.ts new file mode 100644 index 000000000000..96a1c653f185 --- /dev/null +++ b/libs/ledger-live-common/src/families/evm/walletApiAdapter.test.ts @@ -0,0 +1,69 @@ +import { Transaction } from "@ledgerhq/coin-evm/types/index"; +import { EthereumTransaction as WalletAPITransaction } from "@ledgerhq/wallet-api-core"; +import BigNumber from "bignumber.js"; +import eth from "./walletApiAdapter"; + +// FIXME: add tests for tx of type 2 + +describe("getPlatformTransactionSignFlowInfos", () => { + describe("should properly get infos for ETH platform tx", () => { + test("without fees provided", () => { + const ethPlatformTx: WalletAPITransaction = { + family: "ethereum", + amount: new BigNumber(100000), + recipient: "0xABCDEF", + }; + + const expectedLiveTx: Partial = { + family: "evm", + amount: ethPlatformTx.amount, + recipient: ethPlatformTx.recipient, + data: undefined, + gasLimit: undefined, + nonce: undefined, + type: 0, + }; + + const { canEditFees, hasFeesProvided, liveTx } = + eth.getWalletAPITransactionSignFlowInfos(ethPlatformTx); + + expect(canEditFees).toBe(true); + + expect(hasFeesProvided).toBe(false); + + expect(liveTx).toEqual(expectedLiveTx); + }); + + test("with fees provided", () => { + const ethPlatformTx: WalletAPITransaction = { + family: "ethereum", + amount: new BigNumber(100000), + recipient: "0xABCDEF", + gasPrice: new BigNumber(300), + gasLimit: new BigNumber(21000), + }; + + const expectedLiveTx: Partial = { + family: "evm", + amount: ethPlatformTx.amount, + recipient: ethPlatformTx.recipient, + gasPrice: ethPlatformTx.gasPrice, + gasLimit: ethPlatformTx.gasLimit, + customGasLimit: ethPlatformTx.gasLimit, + nonce: undefined, + data: undefined, + feesStrategy: "custom", + type: 0, + }; + + const { canEditFees, hasFeesProvided, liveTx } = + eth.getWalletAPITransactionSignFlowInfos(ethPlatformTx); + + expect(canEditFees).toBe(true); + + expect(hasFeesProvided).toBe(true); + + expect(liveTx).toEqual(expectedLiveTx); + }); + }); +}); diff --git a/libs/ledger-live-common/src/families/evm/walletApiAdapter.ts b/libs/ledger-live-common/src/families/evm/walletApiAdapter.ts new file mode 100644 index 000000000000..f524b33616c5 --- /dev/null +++ b/libs/ledger-live-common/src/families/evm/walletApiAdapter.ts @@ -0,0 +1,55 @@ +import { EthereumTransaction as WalletAPIEthereumTransaction } from "@ledgerhq/wallet-api-core"; +import { Transaction } from "@ledgerhq/coin-evm/types/index"; +import { + AreFeesProvided, + ConvertToLiveTransaction, + GetWalletAPITransactionSignFlowInfos, +} from "../../wallet-api/types"; + +const CAN_EDIT_FEES = true; + +const areFeesProvided: AreFeesProvided = tx => + !!((tx.gasLimit && tx.gasPrice) || (tx.gasLimit && tx.maxFeePerGas && tx.maxPriorityFeePerGas)); + +const convertToLiveTransaction: ConvertToLiveTransaction< + WalletAPIEthereumTransaction, + Transaction +> = tx => { + const hasFeesProvided = areFeesProvided(tx); + + // FIXME: handle tx types (`Transaction["type"]`) properly + + const params = { + family: "evm" as const, + nonce: tx.nonce, + amount: tx.amount, + recipient: tx.recipient, + data: tx.data, + gasLimit: tx.gasLimit, + feesStrategy: hasFeesProvided ? ("custom" as const) : undefined, + customGasLimit: hasFeesProvided ? tx.gasLimit : undefined, + }; + + const liveTx: Partial = + tx.maxPriorityFeePerGas || tx.maxFeePerGas + ? { + ...params, + type: 2, + } + : { ...params, gasPrice: tx.gasPrice, type: 0 }; + + return liveTx; +}; + +const getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos< + WalletAPIEthereumTransaction, + Transaction +> = tx => { + return { + canEditFees: CAN_EDIT_FEES, + liveTx: convertToLiveTransaction(tx), + hasFeesProvided: areFeesProvided(tx), + }; +}; + +export default { getWalletAPITransactionSignFlowInfos }; diff --git a/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.test.ts b/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.test.ts index 0d3a50749f27..4faa14e05566 100644 --- a/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.test.ts +++ b/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.test.ts @@ -1,4 +1,3 @@ -import { Account } from "@ledgerhq/types-live"; import { PolkadotTransaction as PlatformTransaction } from "@ledgerhq/wallet-api-core"; import { Transaction } from "@ledgerhq/coin-polkadot/types"; import BigNumber from "bignumber.js"; @@ -6,8 +5,6 @@ import dot from "./walletApiAdapter"; describe("getWalletAPITransactionSignFlowInfos", () => { describe("should properly get infos for DOT platform tx", () => { - const dummyAccount = {} as Account; - it("with most basic tx", () => { const dotPlatformTx: PlatformTransaction = { family: "polkadot", @@ -23,10 +20,8 @@ describe("getWalletAPITransactionSignFlowInfos", () => { mode: dotPlatformTx.mode, }; - const { canEditFees, hasFeesProvided, liveTx } = dot.getWalletAPITransactionSignFlowInfos({ - tx: dotPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + dot.getWalletAPITransactionSignFlowInfos(dotPlatformTx); expect(canEditFees).toBe(false); @@ -52,10 +47,8 @@ describe("getWalletAPITransactionSignFlowInfos", () => { era: `${dotPlatformTx.era}`, }; - const { canEditFees, hasFeesProvided, liveTx } = dot.getWalletAPITransactionSignFlowInfos({ - tx: dotPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + dot.getWalletAPITransactionSignFlowInfos(dotPlatformTx); expect(canEditFees).toBe(false); diff --git a/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.ts b/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.ts index d0fc1eba30c4..8487dd077c6b 100644 --- a/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.ts +++ b/libs/ledger-live-common/src/families/polkadot/walletApiAdapter.ts @@ -11,7 +11,7 @@ const CAN_EDIT_FEES = false; const convertToLiveTransaction: ConvertToLiveTransaction< WalletAPIPolkadotTransaction, Transaction -> = ({ tx }) => ({ +> = tx => ({ ...tx, era: tx.era ? `${tx.era}` : undefined, }); @@ -19,10 +19,10 @@ const convertToLiveTransaction: ConvertToLiveTransaction< const getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos< WalletAPIPolkadotTransaction, Transaction -> = params => { +> = tx => { return { canEditFees: CAN_EDIT_FEES, - liveTx: convertToLiveTransaction(params), + liveTx: convertToLiveTransaction(tx), hasFeesProvided: false, }; }; diff --git a/libs/ledger-live-common/src/families/ripple/walletApiAdapter.test.ts b/libs/ledger-live-common/src/families/ripple/walletApiAdapter.test.ts index 37feead6c0dd..7fb6be541498 100644 --- a/libs/ledger-live-common/src/families/ripple/walletApiAdapter.test.ts +++ b/libs/ledger-live-common/src/families/ripple/walletApiAdapter.test.ts @@ -1,4 +1,3 @@ -import { Account } from "@ledgerhq/types-live"; import { RippleTransaction as WalletAPITransaction } from "@ledgerhq/wallet-api-core"; import BigNumber from "bignumber.js"; import xrp from "./walletApiAdapter"; @@ -6,8 +5,6 @@ import { Transaction } from "./types"; describe("getWalletAPITransactionSignFlowInfos", () => { describe("should properly get infos for XRP platform tx", () => { - const dummyAccount = {} as Account; - it("without fees provided", () => { const xrpPlatformTx: WalletAPITransaction = { family: "ripple", @@ -20,10 +17,8 @@ describe("getWalletAPITransactionSignFlowInfos", () => { ...xrpPlatformTx, }; - const { canEditFees, hasFeesProvided, liveTx } = xrp.getWalletAPITransactionSignFlowInfos({ - tx: xrpPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + xrp.getWalletAPITransactionSignFlowInfos(xrpPlatformTx); expect(canEditFees).toBe(true); @@ -45,10 +40,8 @@ describe("getWalletAPITransactionSignFlowInfos", () => { ...xrpPlatformTx, }; - const { canEditFees, hasFeesProvided, liveTx } = xrp.getWalletAPITransactionSignFlowInfos({ - tx: xrpPlatformTx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = + xrp.getWalletAPITransactionSignFlowInfos(xrpPlatformTx); expect(canEditFees).toBe(true); diff --git a/libs/ledger-live-common/src/families/ripple/walletApiAdapter.ts b/libs/ledger-live-common/src/families/ripple/walletApiAdapter.ts index d2b4130fa717..5ec1e4122f90 100644 --- a/libs/ledger-live-common/src/families/ripple/walletApiAdapter.ts +++ b/libs/ledger-live-common/src/families/ripple/walletApiAdapter.ts @@ -10,7 +10,7 @@ const areFeesProvided: AreFeesProvided = tx => !!tx. const getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos< WalletAPIRippleTransaction, Transaction -> = ({ tx }) => { +> = tx => { return { canEditFees: CAN_EDIT_FEES, liveTx: tx, diff --git a/libs/ledger-live-common/src/generated/platformAdapter.ts b/libs/ledger-live-common/src/generated/platformAdapter.ts index 32749c35cf55..785bca8ec6f1 100644 --- a/libs/ledger-live-common/src/generated/platformAdapter.ts +++ b/libs/ledger-live-common/src/generated/platformAdapter.ts @@ -1,11 +1,13 @@ import bitcoin from "../families/bitcoin/platformAdapter"; import ethereum from "../families/ethereum/platformAdapter"; +import evm from "../families/evm/platformAdapter"; import ripple from "../families/ripple/platformAdapter"; import polkadot from "@ledgerhq/coin-polkadot/platformAdapter"; export default { bitcoin, ethereum, + evm, ripple, polkadot, }; diff --git a/libs/ledger-live-common/src/generated/walletApiAdapter.ts b/libs/ledger-live-common/src/generated/walletApiAdapter.ts index 01d3f8525c8e..231858b66986 100644 --- a/libs/ledger-live-common/src/generated/walletApiAdapter.ts +++ b/libs/ledger-live-common/src/generated/walletApiAdapter.ts @@ -1,11 +1,13 @@ import bitcoin from "../families/bitcoin/walletApiAdapter"; import ethereum from "../families/ethereum/walletApiAdapter"; +import evm from "../families/evm/walletApiAdapter"; import polkadot from "../families/polkadot/walletApiAdapter"; import ripple from "../families/ripple/walletApiAdapter"; export default { bitcoin, ethereum, + evm, polkadot, ripple, }; diff --git a/libs/ledger-live-common/src/mock/fixtures/cryptoCurrencies.ts b/libs/ledger-live-common/src/mock/fixtures/cryptoCurrencies.ts index e86c98a25d04..013c120345b0 100644 --- a/libs/ledger-live-common/src/mock/fixtures/cryptoCurrencies.ts +++ b/libs/ledger-live-common/src/mock/fixtures/cryptoCurrencies.ts @@ -47,7 +47,7 @@ export function createFixtureTokenAccount( return { type: "TokenAccount", id: `js:2:ethereum:0x${id}:+ethereum%2Ferc20%2Fusd_tether__erc20_`, - parentId: `ethereumjs:2:ethereum:0x0${id}:`, + parentId: `js:2:ethereum:0x0${id}:`, token, balance: new BigNumber("51281813126095913"), spendableBalance: new BigNumber("51281813126095913"), @@ -80,7 +80,7 @@ export function createFixtureAccount( ): Account { return { type: "Account", - id: `${currency.family}js:2:${currency.family}:0x0${id}:`, + id: `js:2:${currency.id}:0x0${id}:`, seedIdentifier: "0x01", derivationMode: "ethM", index: 0, diff --git a/libs/ledger-live-common/src/platform/converters.test.ts b/libs/ledger-live-common/src/platform/converters.test.ts index 0a46a9bc0186..89ec208c7449 100644 --- a/libs/ledger-live-common/src/platform/converters.test.ts +++ b/libs/ledger-live-common/src/platform/converters.test.ts @@ -9,7 +9,7 @@ import type { PlatformTransaction } from "./types"; const ethBridge = jest.fn(); jest.mock("../generated/platformAdapter", () => { return { - ethereum: { + evm: { getPlatformTransactionSignFlowInfos: function () { return ethBridge(); }, diff --git a/libs/ledger-live-common/src/platform/converters.ts b/libs/ledger-live-common/src/platform/converters.ts index 33cd9daf421a..7cfad5f949a9 100644 --- a/libs/ledger-live-common/src/platform/converters.ts +++ b/libs/ledger-live-common/src/platform/converters.ts @@ -1,14 +1,15 @@ +import { FAMILIES } from "@ledgerhq/live-app-sdk"; import { Account, AccountLike } from "@ledgerhq/types-live"; +import { isSubAccount, isTokenAccount } from "../account"; import byFamily from "../generated/platformAdapter"; import type { Transaction } from "../generated/types"; -import { isTokenAccount, isSubAccount } from "../account"; import { PlatformAccount, PlatformCurrency, - PlatformTransaction, PlatformCurrencyType, - PlatformTokenStandard, PlatformSupportedCurrency, + PlatformTokenStandard, + PlatformTransaction, } from "./types"; export function accountToPlatformAccount( @@ -93,7 +94,11 @@ export const getPlatformTransactionSignFlowInfos = ( hasFeesProvided: boolean; liveTx: Partial; } => { - const family = byFamily[platformTx.family]; + // This is a hack to link WalletAPI "ethereum" family to new "evm" family + const isEthereumFamily = platformTx.family === FAMILIES.ETHEREUM; + const tyFamily = isEthereumFamily ? "evm" : platformTx.family; + + const family = byFamily[tyFamily]; if (family) { return family.getPlatformTransactionSignFlowInfos(platformTx); diff --git a/libs/ledger-live-common/src/platform/logic.test.ts b/libs/ledger-live-common/src/platform/logic.test.ts index f335582c2032..11ba43c8ae9c 100644 --- a/libs/ledger-live-common/src/platform/logic.test.ts +++ b/libs/ledger-live-common/src/platform/logic.test.ts @@ -1,17 +1,5 @@ -import { - broadcastTransactionLogic, - completeExchangeLogic, - receiveOnAccountLogic, - signMessageLogic, - WebPlatformContext, -} from "./logic"; - -import { LiveAppManifest } from "./types"; -import { - createFixtureAccount, - createFixtureTokenAccount, - createFixtureCryptoCurrency, -} from "../mock/fixtures/cryptoCurrencies"; +import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/index"; +import { TokenCurrency } from "@ledgerhq/types-cryptoassets"; import { OperationType, SignedOperation, @@ -19,14 +7,24 @@ import { TokenAccount, } from "@ledgerhq/types-live"; import BigNumber from "bignumber.js"; - -import * as converters from "./converters"; -import * as serializers from "./serializers"; +import { setSupportedCurrencies } from "../currencies"; import * as signMessage from "../hw/signMessage/index"; -import { TokenCurrency } from "@ledgerhq/types-cryptoassets"; +import { + createFixtureAccount, + createFixtureCryptoCurrency, + createFixtureTokenAccount, +} from "../mock/fixtures/cryptoCurrencies"; +import * as converters from "./converters"; +import { + broadcastTransactionLogic, + completeExchangeLogic, + receiveOnAccountLogic, + signMessageLogic, + WebPlatformContext, +} from "./logic"; import { RawPlatformTransaction } from "./rawTypes"; -import { setSupportedCurrencies } from "../currencies"; -import { Transaction as EthereumTransaction } from "../families/ethereum/types"; +import * as serializers from "./serializers"; +import { LiveAppManifest } from "./types"; describe("receiveOnAccountLogic", () => { // Given @@ -50,7 +48,7 @@ describe("receiveOnAccountLogic", () => { describe("when nominal case", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const expectedResult = "Function called"; beforeEach(() => uiNavigation.mockResolvedValueOnce(expectedResult)); @@ -84,7 +82,7 @@ describe("receiveOnAccountLogic", () => { describe("when account cannot be found", () => { // Given - const nonFoundAccountId = "ethereumjs:2:ethereum:0x010:"; + const nonFoundAccountId = "js:2:ethereum:0x010:"; it("returns an error", async () => { // When @@ -148,7 +146,7 @@ describe("completeExchangeLogic", () => { const completeExchangeRequest = { provider: "provider", fromAccountId: "js:2:ethereum:0x16:+ethereum%2Ferc20%2Fusd_tether__erc20_", - toAccountId: "ethereumjs:2:ethereum:0x042:", + toAccountId: "js:2:ethereum:0x042:", transaction: rawPlatformTransaction, binaryPayload: "binaryPayload", signature: "signature", @@ -156,23 +154,23 @@ describe("completeExchangeLogic", () => { exchangeType: 8, }; - const expectedTransaction: EthereumTransaction = { - family: "ethereum", + const expectedTransaction: EvmTransaction = { + family: "evm", amount: new BigNumber("1000000000"), subAccountId: "js:2:ethereum:0x16:+ethereum%2Ferc20%2Fusd_tether__erc20_", recipient: "0x0123456", nonce: 8, data: Buffer.from("Some data...", "hex"), + type: 0, gasPrice: new BigNumber("700000"), - maxFeePerGas: null, - maxPriorityFeePerGas: null, - userGasLimit: new BigNumber("1200000"), + maxFeePerGas: undefined, + maxPriorityFeePerGas: undefined, + gasLimit: new BigNumber("1200000"), + customGasLimit: new BigNumber("1200000"), feesStrategy: "medium", - estimatedGasLimit: null, - feeCustomUnit: { name: "Gwei", code: "Gwei", magnitude: 9 }, mode: "send", - networkInfo: null, useAllAmount: false, + chainId: 1, }; // When @@ -204,8 +202,8 @@ describe("completeExchangeLogic", () => { const rawPlatformTransaction = createRawEtherumTransaction(); const completeExchangeRequest = { provider: "provider", - fromAccountId: "ethereumjs:2:ethereum:0x017:", - toAccountId: "ethereumjs:2:ethereum:0x042:", + fromAccountId: "js:2:ethereum:0x017:", + toAccountId: "js:2:ethereum:0x042:", transaction: rawPlatformTransaction, binaryPayload: "binaryPayload", signature: "signature", @@ -213,22 +211,23 @@ describe("completeExchangeLogic", () => { exchangeType: 8, }; - const expectedTransaction: EthereumTransaction = { - family: "ethereum", + const expectedTransaction: EvmTransaction = { + family: "evm", amount: new BigNumber("1000000000"), recipient: "0x0123456", nonce: 8, data: Buffer.from("Some data...", "hex"), gasPrice: new BigNumber("700000"), - maxFeePerGas: null, - maxPriorityFeePerGas: null, - userGasLimit: new BigNumber("1200000"), + gasLimit: new BigNumber("1200000"), + customGasLimit: new BigNumber("1200000"), feesStrategy: "medium", - estimatedGasLimit: null, - feeCustomUnit: { name: "Gwei", code: "Gwei", magnitude: 9 }, mode: "send", - networkInfo: null, useAllAmount: false, + chainId: 1, + subAccountId: undefined, + type: 0, + maxFeePerGas: undefined, + maxPriorityFeePerGas: undefined, }; // When @@ -262,8 +261,8 @@ describe("completeExchangeLogic", () => { const rawPlatformTransaction = createRawEtherumTransaction(); const completeExchangeRequest = { provider: "provider", - fromAccountId: "ethereumjs:2:ethereum:0x017:", - toAccountId: "ethereumjs:2:ethereum:0x042:", + fromAccountId: "js:2:ethereum:0x017:", + toAccountId: "js:2:ethereum:0x042:", transaction: rawPlatformTransaction, binaryPayload: "binaryPayload", signature: "signature", @@ -286,8 +285,8 @@ describe("completeExchangeLogic", () => { // Given const completeExchangeRequest = { provider: "provider", - fromAccountId: "ethereumjs:2:ethereum:0x012:", - toAccountId: "ethereumjs:2:ethereum:0x042:", + fromAccountId: "js:2:ethereum:0x012:", + toAccountId: "js:2:ethereum:0x042:", transaction: createRawEtherumTransaction(), binaryPayload: "binaryPayload", signature: "signature", @@ -316,8 +315,8 @@ describe("completeExchangeLogic", () => { const rawPlatformTransaction = createRawBitcoinTransaction(); const completeExchangeRequest = { provider: "provider", - fromAccountId: "ethereumjs:2:ethereum:0x017:", - toAccountId: "ethereumjs:2:ethereum:0x042:", + fromAccountId: "js:2:ethereum:0x017:", + toAccountId: "js:2:ethereum:0x042:", transaction: rawPlatformTransaction, binaryPayload: "binaryPayload", signature: "signature", @@ -355,7 +354,7 @@ describe("broadcastTransactionLogic", () => { describe("when nominal case", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const rawSignedTransaction = createSignedOperationRaw(); it("calls uiNavigation callback with a signedOperation", async () => { @@ -392,7 +391,7 @@ describe("broadcastTransactionLogic", () => { describe("when account cannot be found", () => { // Given - const nonFoundAccountId = "ethereumjs:2:ethereum:0x010:"; + const nonFoundAccountId = "js:2:ethereum:0x010:"; const rawSignedTransaction = createSignedOperationRaw(); it("returns an error", async () => { @@ -457,7 +456,7 @@ describe("signMessageLogic", () => { describe("when nominal case", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const messageToSign = "Message to sign"; const spyPrepareMessageToSign = jest.spyOn(signMessage, "prepareMessageToSign"); @@ -491,7 +490,7 @@ describe("signMessageLogic", () => { describe("when account cannot be found", () => { // Given - const nonFoundAccountId = "ethereumjs:2:ethereum:0x010:"; + const nonFoundAccountId = "js:2:ethereum:0x010:"; const messageToSign = "Message to sign"; it("returns an error", async () => { @@ -546,7 +545,7 @@ describe("signMessageLogic", () => { describe("when inner call prepareMessageToSign raise an error", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const messageToSign = "Message to sign"; const spyPrepareMessageToSign = jest.spyOn(signMessage, "prepareMessageToSign"); diff --git a/libs/ledger-live-common/src/platform/logic.ts b/libs/ledger-live-common/src/platform/logic.ts index 8fcdb417f627..7b840f9dd663 100644 --- a/libs/ledger-live-common/src/platform/logic.ts +++ b/libs/ledger-live-common/src/platform/logic.ts @@ -199,7 +199,10 @@ export function completeExchangeLogic( const mainFromAccount = getMainAccount(fromAccount, fromParentAccount); const mainFromAccountFamily = mainFromAccount.currency.family; - if (transaction.family !== mainFromAccountFamily) { + if ( + transaction.family !== mainFromAccountFamily && + !(mainFromAccountFamily === "evm" && transaction.family === "ethereum") + ) { return Promise.reject( new Error( `Account and transaction must be from the same family. Account family: ${mainFromAccountFamily}, Transaction family: ${transaction.family}`, diff --git a/libs/ledger-live-common/src/wallet-api/converters.test.ts b/libs/ledger-live-common/src/wallet-api/converters.test.ts index 1fc30d0d4be9..c9bb75fa31e7 100644 --- a/libs/ledger-live-common/src/wallet-api/converters.test.ts +++ b/libs/ledger-live-common/src/wallet-api/converters.test.ts @@ -1,4 +1,3 @@ -import { Account } from "@ledgerhq/types-live"; import BigNumber from "bignumber.js"; import "../__tests__/test-helpers/setup"; @@ -22,8 +21,6 @@ describe("getWalletAPITransactionSignFlowInfos", () => { ethBridge.mockClear(); }); - const dummyAccount = {} as Account; - it("calls the bridge if the implementation exists", () => { // Given const tx: WalletAPITransaction = { @@ -33,7 +30,7 @@ describe("getWalletAPITransactionSignFlowInfos", () => { }; // When - getWalletAPITransactionSignFlowInfos({ tx, account: dummyAccount }); + getWalletAPITransactionSignFlowInfos(tx); // Then expect(ethBridge).toBeCalledTimes(1); @@ -56,10 +53,7 @@ describe("getWalletAPITransactionSignFlowInfos", () => { }; // When - const { canEditFees, hasFeesProvided, liveTx } = getWalletAPITransactionSignFlowInfos({ - tx, - account: dummyAccount, - }); + const { canEditFees, hasFeesProvided, liveTx } = getWalletAPITransactionSignFlowInfos(tx); // Then expect(ethBridge).toBeCalledTimes(0); diff --git a/libs/ledger-live-common/src/wallet-api/converters.ts b/libs/ledger-live-common/src/wallet-api/converters.ts index 0a15d0c59f8b..016a9717f0a6 100644 --- a/libs/ledger-live-common/src/wallet-api/converters.ts +++ b/libs/ledger-live-common/src/wallet-api/converters.ts @@ -94,15 +94,11 @@ export function currencyToWalletAPICurrency( export const getWalletAPITransactionSignFlowInfos: GetWalletAPITransactionSignFlowInfos< WalletAPITransaction, Transaction -> = ({ tx, account, parentAccount }) => { +> = tx => { const family = byFamily[tx.family]; if (family) { - return family.getWalletAPITransactionSignFlowInfos({ - tx, - account, - parentAccount, - }); + return family.getWalletAPITransactionSignFlowInfos(tx); } return { diff --git a/libs/ledger-live-common/src/wallet-api/logic.test.ts b/libs/ledger-live-common/src/wallet-api/logic.test.ts index e37d7ba730f0..069b6089ad6d 100644 --- a/libs/ledger-live-common/src/wallet-api/logic.test.ts +++ b/libs/ledger-live-common/src/wallet-api/logic.test.ts @@ -48,7 +48,7 @@ describe("receiveOnAccountLogic", () => { describe("when nominal case", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const walletAccountId = "806ea21d-f5f0-425a-add3-39d4b78209f1"; const expectedResult = "Function called"; @@ -141,7 +141,7 @@ describe("broadcastTransactionLogic", () => { describe("when nominal case", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const walletAccountId = "806ea21d-f5f0-425a-add3-39d4b78209f1"; const signedTransaction = createSignedOperation(); @@ -183,7 +183,7 @@ describe("broadcastTransactionLogic", () => { describe("when account cannot be found", () => { // Given - const nonFoundAccountId = "ethereumjs:2:ethereum:0x010:"; + const nonFoundAccountId = "js:2:ethereum:0x010:"; const walletAccountId = "806ea21d-f5f0-425a-add3-39d4b78209f1"; const signedTransaction = createSignedOperation(); @@ -250,7 +250,7 @@ describe("signMessageLogic", () => { describe("when nominal case", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const messageToSign = "Message to sign"; const spyPrepareMessageToSign = jest.spyOn(signMessage, "prepareMessageToSign"); @@ -289,7 +289,7 @@ describe("signMessageLogic", () => { describe("when account cannot be found", () => { // Given - const nonFoundAccountId = "ethereumjs:2:ethereum:0x010:"; + const nonFoundAccountId = "js:2:ethereum:0x010:"; const messageToSign = "Message to sign"; const walletAccountId = "806ea21d-f5f0-425a-add3-39d4b78209f1"; @@ -356,7 +356,7 @@ describe("signMessageLogic", () => { describe("when inner call prepareMessageToSign raise an error", () => { // Given - const accountId = "ethereumjs:2:ethereum:0x012:"; + const accountId = "js:2:ethereum:0x012:"; const messageToSign = "Message to sign"; const spyPrepareMessageToSign = jest.spyOn(signMessage, "prepareMessageToSign"); @@ -439,12 +439,12 @@ describe("bitcoinFamillyAccountGetXPubLogic", () => { }, { desc: "account not found", - accountId: "ethereumjs:2:ethereum:0x010:", + accountId: "js:2:ethereum:0x010:", errorMessage: "account not found", }, { desc: "account is not a bitcoin family account", - accountId: "ethereumjs:2:ethereum:0x012:", + accountId: "js:2:ethereum:0x012:", errorMessage: "not a bitcoin family account", }, ])("returns an error when $desc", async ({ accountId, errorMessage }) => { @@ -465,7 +465,7 @@ describe("bitcoinFamillyAccountGetXPubLogic", () => { it("should return the xpub", async () => { // Given - const accountId = "bitcoinjs:2:bitcoin:0x013:"; + const accountId = "js:2:bitcoin:0x013:"; getAccountIdFromWalletAccountIdSpy.mockReturnValueOnce(accountId); // When diff --git a/libs/ledger-live-common/src/wallet-api/logic.ts b/libs/ledger-live-common/src/wallet-api/logic.ts index 3596621dd4da..7b530a9bb694 100644 --- a/libs/ledger-live-common/src/wallet-api/logic.ts +++ b/libs/ledger-live-common/src/wallet-api/logic.ts @@ -109,11 +109,8 @@ export function signTransactionLogic( ); } - const { canEditFees, liveTx, hasFeesProvided } = getWalletAPITransactionSignFlowInfos({ - tx: transaction, - account, - parentAccount, - }); + const { canEditFees, liveTx, hasFeesProvided } = + getWalletAPITransactionSignFlowInfos(transaction); return uiNavigation(account, parentAccount, { canEditFees, @@ -316,11 +313,7 @@ export function completeExchangeLogic( ); } - const { liveTx } = getWalletAPITransactionSignFlowInfos({ - tx: transaction, - account: fromAccount, - parentAccount: fromParentAccount, - }); + const { liveTx } = getWalletAPITransactionSignFlowInfos(transaction); /** * 'subAccountId' is used for ETH and it's ERC-20 tokens. diff --git a/libs/ledger-live-common/src/wallet-api/types.ts b/libs/ledger-live-common/src/wallet-api/types.ts index 926b86c58852..b18787f5550d 100644 --- a/libs/ledger-live-common/src/wallet-api/types.ts +++ b/libs/ledger-live-common/src/wallet-api/types.ts @@ -1,4 +1,4 @@ -import type { Account, AccountLike, SignedOperation } from "@ledgerhq/types-live"; +import type { SignedOperation } from "@ledgerhq/types-live"; import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets"; import type { Transaction as WalletAPITransaction } from "@ledgerhq/wallet-api-core"; import type { Transaction } from "../generated/types"; @@ -48,7 +48,7 @@ export type WalletAPISupportedCurrency = CryptoCurrency | TokenCurrency; export type GetWalletAPITransactionSignFlowInfos< T extends WalletAPITransaction, U extends Transaction, -> = ({ tx, account, parentAccount }: { tx: T; account: AccountLike; parentAccount?: Account }) => { +> = (tx: T) => { canEditFees: boolean; hasFeesProvided: boolean; liveTx: Partial; @@ -56,10 +56,9 @@ export type GetWalletAPITransactionSignFlowInfos< export type AreFeesProvided = (tx: T) => boolean; -export type ConvertToLiveTransaction< - T extends WalletAPITransaction, - U extends Transaction, -> = (params: { tx: T; account: AccountLike; parentAccount?: Account }) => Partial; +export type ConvertToLiveTransaction = ( + tx: T, +) => Partial; export type DiscoverDB = { recentlyUsed: RecentlyUsed[]; From b88d7ca0b06e48b010eda8600286cfaeb868630d Mon Sep 17 00:00:00 2001 From: Alexandre Chabrolin <9203826+chabroA@users.noreply.github.com> Date: Fri, 11 Aug 2023 15:46:14 +0200 Subject: [PATCH 02/11] comment out remaining logic related to edit eth tx kept commented for now to keep a framework that can be used for the integration of this feature on evm, which should be done shortly --- .../OperationsList/EditOperationPanel.tsx | 21 +++--- .../drawers/OperationDetails/index.tsx | 70 +++++++++++-------- .../modals/Receive/steps/StepReceiveFunds.tsx | 21 +++--- .../modals/Send/steps/StepConfirmation.tsx | 20 +++--- .../src/components/EditOperationCard.tsx | 38 +++++----- .../RootNavigator/BaseNavigator.tsx | 10 ++- .../RootNavigator/types/BaseNavigator.ts | 6 +- .../src/screens/OperationDetails/Content.tsx | 20 +++--- 8 files changed, 117 insertions(+), 89 deletions(-) diff --git a/apps/ledger-live-desktop/src/renderer/components/OperationsList/EditOperationPanel.tsx b/apps/ledger-live-desktop/src/renderer/components/OperationsList/EditOperationPanel.tsx index eb41258d8d33..92d294358d93 100644 --- a/apps/ledger-live-desktop/src/renderer/components/OperationsList/EditOperationPanel.tsx +++ b/apps/ledger-live-desktop/src/renderer/components/OperationsList/EditOperationPanel.tsx @@ -1,9 +1,11 @@ +// FIXME: to update when implementing edit transaction on evm + import React, { useCallback, memo } from "react"; import { AccountLike, Account, Operation } from "@ledgerhq/types-live"; import { Trans } from "react-i18next"; import Alert from "~/renderer/components/Alert"; import Link from "~/renderer/components/Link"; -import { openModal, closeModal } from "~/renderer/actions/modals"; +import { closeModal } from "~/renderer/actions/modals"; import { useDispatch } from "react-redux"; import { useFeature } from "@ledgerhq/live-common/featureFlags/index"; import invariant from "invariant"; @@ -21,14 +23,15 @@ const EditOperationPanel = (props: Props) => { const handleOpenEditModal = useCallback(() => { invariant(operation.transactionRaw, "operation.transactionRaw is required"); dispatch(closeModal("MODAL_SEND")); - dispatch( - openModal("MODAL_EDIT_TRANSACTION", { - account, - parentAccount, - transactionRaw: operation.transactionRaw, - transactionHash: operation.hash, - }), - ); + // dispatch( + // openModal("MODAL_EDIT_TRANSACTION", { + // account, + // parentAccount, + // transactionRaw: operation.transactionRaw, + // transactionHash: operation.hash, + // }), + // ); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [parentAccount, account, operation, dispatch]); if (!editEthTx?.enabled) { diff --git a/apps/ledger-live-desktop/src/renderer/drawers/OperationDetails/index.tsx b/apps/ledger-live-desktop/src/renderer/drawers/OperationDetails/index.tsx index c126ad5adaba..674c4010d9a5 100644 --- a/apps/ledger-live-desktop/src/renderer/drawers/OperationDetails/index.tsx +++ b/apps/ledger-live-desktop/src/renderer/drawers/OperationDetails/index.tsx @@ -1,5 +1,7 @@ +// FIXME: to update when implementing edit transaction on evm + import React, { useMemo, Component, useCallback } from "react"; -import { connect, useDispatch } from "react-redux"; +import { connect } from "react-redux"; import { useHistory, useLocation } from "react-router-dom"; import { Trans, TFunction, useTranslation } from "react-i18next"; import styled from "styled-components"; @@ -70,7 +72,7 @@ import CryptoCurrencyIcon from "~/renderer/components/CryptoCurrencyIcon"; import AmountDetails from "./AmountDetails"; import NFTOperationDetails from "./NFTOperationDetails"; import { State } from "~/renderer/reducers"; -import { openModal } from "~/renderer/actions/modals"; +// import { openModal } from "~/renderer/actions/modals"; import { getLLDCoinFamily } from "~/renderer/families"; const mapStateToProps = ( @@ -244,34 +246,42 @@ const OperationD = (props: Props) => { : undefined; const editEthTx = useFeature("editEthTx"); const editable = editEthTx?.enabled && isEditableOperation(mainAccount, operation); - const dispatch = useDispatch(); - const handleOpenEditModal = useCallback( - (account, parentAccount, transactionRaw, transactionHash) => { - setDrawer(undefined); - if (subOperations.length > 0 && isToken) { - // if the operation is a token operation,(ERC-20 send), in order to speedup/cancel we need to find the subAccount - const opAccount = findSubAccountById(account, subOperations[0].accountId); - dispatch( - openModal("MODAL_EDIT_TRANSACTION", { - account: opAccount, - parentAccount: account, - transactionRaw, - transactionHash, - }), - ); - } else { - dispatch( - openModal("MODAL_EDIT_TRANSACTION", { - account, - parentAccount, - transactionRaw, - transactionHash, - }), - ); - } - }, - [dispatch, isToken, subOperations], - ); + // const dispatch = useDispatch(); + // const handleOpenEditModal = useCallback( + // (account, parentAccount, transactionRaw, transactionHash) => { + // setDrawer(undefined); + // if (subOperations.length > 0 && isToken) { + // // if the operation is a token operation,(ERC-20 send), in order to speedup/cancel we need to find the subAccount + // const opAccount = findSubAccountById(account, subOperations[0].accountId); + // dispatch( + // openModal("MODAL_EDIT_TRANSACTION", { + // account: opAccount, + // parentAccount: account, + // transactionRaw, + // transactionHash, + // }), + // ); + // } else { + // dispatch( + // openModal("MODAL_EDIT_TRANSACTION", { + // account, + // parentAccount, + // transactionRaw, + // transactionHash, + // }), + // ); + // } + // }, + // [dispatch, isToken, subOperations], + // ); + + const handleOpenEditModal = ( + _account: unknown, + _parentAccount: unknown, + _transactionRaw: unknown, + _transactionHash: unknown, + ) => {}; + // pending transactions that exceeds 5 minutes are considered as stuck transactions const isStuck = new Date().getTime() - operation.date.getTime() > getEnv("ETHEREUM_STUCK_TRANSACTION_TIMEOUT"); diff --git a/apps/ledger-live-desktop/src/renderer/modals/Receive/steps/StepReceiveFunds.tsx b/apps/ledger-live-desktop/src/renderer/modals/Receive/steps/StepReceiveFunds.tsx index 30b5dfbab985..7b9709405c2c 100644 --- a/apps/ledger-live-desktop/src/renderer/modals/Receive/steps/StepReceiveFunds.tsx +++ b/apps/ledger-live-desktop/src/renderer/modals/Receive/steps/StepReceiveFunds.tsx @@ -1,3 +1,5 @@ +// FIXME: to update when implementing edit transaction on evm + import invariant from "invariant"; import React, { useEffect, useRef, useCallback, useState } from "react"; import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; @@ -32,7 +34,7 @@ import AccountTagDerivationMode from "~/renderer/components/AccountTagDerivation import { useFeature } from "@ledgerhq/live-common/featureFlags/index"; import { LOCAL_STORAGE_KEY_PREFIX } from "./StepReceiveStakingFlow"; import { useDispatch } from "react-redux"; -import { openModal } from "~/renderer/actions/modals"; +// import { openModal } from "~/renderer/actions/modals"; import { Device } from "@ledgerhq/live-common/hw/actions/types"; import { getLLDCoinFamily } from "~/renderer/families"; @@ -212,14 +214,14 @@ const StepReceiveFunds = (props: StepProps) => { account: name, }); if (receiveStakingFlowConfig?.params?.[id]?.direct) { - dispatch( - openModal("MODAL_ETH_STAKE", { - account: mainAccount, - hasCheckbox: true, - singleProviderRedirectMode: false, - source: "receive", - }), - ); + // dispatch( + // openModal("MODAL_ETH_STAKE", { + // account: mainAccount, + // hasCheckbox: true, + // singleProviderRedirectMode: false, + // source: "receive", + // }), + // ); onClose(); } else { transitionTo("stakingFlow"); @@ -227,6 +229,7 @@ const StepReceiveFunds = (props: StepProps) => { } else { onClose(); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [ mainAccount, currencyName, diff --git a/apps/ledger-live-desktop/src/renderer/modals/Send/steps/StepConfirmation.tsx b/apps/ledger-live-desktop/src/renderer/modals/Send/steps/StepConfirmation.tsx index a04e5c44a4cf..c649652fa28c 100644 --- a/apps/ledger-live-desktop/src/renderer/modals/Send/steps/StepConfirmation.tsx +++ b/apps/ledger-live-desktop/src/renderer/modals/Send/steps/StepConfirmation.tsx @@ -1,8 +1,9 @@ +// FIXME: to update when implementing edit transaction on evm + import React from "react"; import { Trans } from "react-i18next"; import styled from "styled-components"; import { SyncOneAccountOnMount } from "@ledgerhq/live-common/bridge/react/index"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; import TrackPage from "~/renderer/analytics/TrackPage"; import { multiline } from "~/renderer/styles/helpers"; import Box from "~/renderer/components/Box"; @@ -14,7 +15,6 @@ import BroadcastErrorDisclaimer from "~/renderer/components/BroadcastErrorDiscla import { OperationDetails } from "~/renderer/drawers/OperationDetails"; import { setDrawer } from "~/renderer/drawers/Provider"; import { StepProps } from "../types"; -import { TransactionHasBeenValidatedError } from "@ledgerhq/errors"; const Container = styled(Box).attrs(() => ({ alignItems: "center", @@ -34,8 +34,6 @@ function StepConfirmation({ isNFTSend, signed, currencyName, - account, - parentAccount, }: StepProps) { if (optimisticOperation) { return ( @@ -59,13 +57,13 @@ function StepConfirmation({ ); } if (error) { - // Edit ethereum transaction nonce error because transaction has been validated - if (error.name === "LedgerAPI4xx" && error.message.includes("nonce too low")) { - const mainAccount = account ? getMainAccount(account, parentAccount) : null; - if (mainAccount?.currency?.family === "ethereum") { - error = new TransactionHasBeenValidatedError(); - } - } + // // Edit ethereum transaction nonce error because transaction has been validated + // if (error.name === "LedgerAPI4xx" && error.message.includes("nonce too low")) { + // const mainAccount = account ? getMainAccount(account, parentAccount) : null; + // if (mainAccount?.currency?.family === "evm") { + // error = new TransactionHasBeenValidatedError(); + // } + // } return ( diff --git a/apps/ledger-live-mobile/src/components/EditOperationCard.tsx b/apps/ledger-live-mobile/src/components/EditOperationCard.tsx index 6f58936aa0ee..483e3e677141 100644 --- a/apps/ledger-live-mobile/src/components/EditOperationCard.tsx +++ b/apps/ledger-live-mobile/src/components/EditOperationCard.tsx @@ -1,12 +1,14 @@ -import React, { useCallback } from "react"; +// FIXME: to update when implementing edit transaction on evm + +import React from "react"; import { useTranslation } from "react-i18next"; import { SideImageCard } from "@ledgerhq/native-ui"; import { Account, AccountLike, Operation } from "@ledgerhq/types-live"; import { useFeature } from "@ledgerhq/live-common/featureFlags/index"; -import { useNavigation } from "@react-navigation/core"; +// import { useNavigation } from "@react-navigation/core"; import SectionContainer from "../screens/WalletCentricSections/SectionContainer"; -import { NavigatorName, ScreenName } from "../const"; +// import { NavigatorName, ScreenName } from "../const"; type EditOperationCardProps = { oldestEditableOperation: Operation; @@ -20,25 +22,29 @@ export const EditOperationCard = ({ oldestEditableOperation, isOperationStuck, onPress, + // eslint-disable-next-line @typescript-eslint/no-unused-vars account, + // eslint-disable-next-line @typescript-eslint/no-unused-vars parentAccount, }: EditOperationCardProps) => { const { t } = useTranslation(); const flag = useFeature("editEthTx"); - const navigation = useNavigation(); + // const navigation = useNavigation(); + + // const onEditTrnasctionCardPress = useCallback(() => { + // if (account) { + // navigation.navigate(NavigatorName.EditTransaction, { + // screen: ScreenName.EditTransactionMethodSelection, + // params: { + // operation: oldestEditableOperation, + // account, + // parentAccount, + // }, + // }); + // } + // }, [account, oldestEditableOperation, parentAccount, navigation]); - const onEditTrnasctionCardPress = useCallback(() => { - if (account) { - navigation.navigate(NavigatorName.EditTransaction, { - screen: ScreenName.EditTransactionMethodSelection, - params: { - operation: oldestEditableOperation, - account, - parentAccount, - }, - }); - } - }, [account, oldestEditableOperation, parentAccount, navigation]); + const onEditTrnasctionCardPress = () => {}; return flag?.enabled ? ( diff --git a/apps/ledger-live-mobile/src/components/RootNavigator/BaseNavigator.tsx b/apps/ledger-live-mobile/src/components/RootNavigator/BaseNavigator.tsx index 7383116d2385..f560436c3fbc 100644 --- a/apps/ledger-live-mobile/src/components/RootNavigator/BaseNavigator.tsx +++ b/apps/ledger-live-mobile/src/components/RootNavigator/BaseNavigator.tsx @@ -1,3 +1,5 @@ +// FIXME: to update when implementing edit transaction on evm + import React, { useMemo } from "react"; import { createStackNavigator, @@ -90,7 +92,8 @@ import { } from "../NavigationHeaderCloseButton"; import { RedirectToRecoverStaxFlowScreen } from "../../screens/Protect/RedirectToRecoverStaxFlow"; import { RootDrawer } from "../RootDrawer/RootDrawer"; -import EditTransactionNavigator from "../../families/ethereum/EditTransactionFlow/EditTransactionNavigator"; +// to keep until edit transaction on evm is implemented +// import EditTransactionNavigator from "../../families/ethereum/EditTransactionFlow/EditTransactionNavigator"; import { DrawerProps } from "../RootDrawer/types"; const Stack = createStackNavigator(); @@ -577,11 +580,12 @@ export default function BaseNavigator() { headerLeft: () => null, }} /> - + /> */} ); diff --git a/apps/ledger-live-mobile/src/components/RootNavigator/types/BaseNavigator.ts b/apps/ledger-live-mobile/src/components/RootNavigator/types/BaseNavigator.ts index 6dd166789cf1..1ae3820b932c 100644 --- a/apps/ledger-live-mobile/src/components/RootNavigator/types/BaseNavigator.ts +++ b/apps/ledger-live-mobile/src/components/RootNavigator/types/BaseNavigator.ts @@ -1,3 +1,5 @@ +// FIXME: to update when implementing edit transaction on evm + import type { Operation, AccountLike, Account, DeviceInfo } from "@ledgerhq/types-live"; import type { NavigatorScreenParams, ParamListBase } from "@react-navigation/native"; import type { RampCatalogEntry } from "@ledgerhq/live-common/platform/providers/RampCatalogProvider/types"; @@ -60,7 +62,7 @@ import type { CosmosClaimRewardsFlowParamList } from "../../../families/cosmos/C import type { SolanaDelegationFlowParamList } from "../../../families/solana/DelegationFlow/types"; import type { StellarAddAssetFlowParamList } from "../../../families/stellar/AddAssetFlow/types"; import type { TezosDelegationFlowParamList } from "../../../families/tezos/DelegationFlow/types"; -import type { EditTransactionParamList } from "../../../families/ethereum/EditTransactionFlow/EditTransactionParamList"; +// import type { EditTransactionParamList } from "../../../families/ethereum/EditTransactionFlow/EditTransactionParamList"; import type { TronVoteFlowParamList } from "../../../families/tron/VoteFlow/types"; import type { NoFundsNavigatorParamList } from "./NoFundsNavigator"; import type { StakeNavigatorParamList } from "./StakeNavigator"; @@ -292,7 +294,7 @@ export type BaseNavigatorStackParamList = { [NavigatorName.CosmosClaimRewardsFlow]: NavigatorScreenParams; // Ethereum - [NavigatorName.EditTransaction]: NavigatorScreenParams; + // [NavigatorName.EditTransaction]: NavigatorScreenParams; // Solana [NavigatorName.SolanaDelegationFlow]: NavigatorScreenParams; diff --git a/apps/ledger-live-mobile/src/screens/OperationDetails/Content.tsx b/apps/ledger-live-mobile/src/screens/OperationDetails/Content.tsx index a9791a78cc97..949a4dfe8233 100644 --- a/apps/ledger-live-mobile/src/screens/OperationDetails/Content.tsx +++ b/apps/ledger-live-mobile/src/screens/OperationDetails/Content.tsx @@ -1,3 +1,5 @@ +// FIXME: to update when implementing edit transaction on evm + import React, { useCallback, useState } from "react"; import { View, StyleSheet, Linking } from "react-native"; import uniq from "lodash/uniq"; @@ -19,8 +21,8 @@ import { import { useNftCollectionMetadata, useNftMetadata } from "@ledgerhq/live-common/nft/index"; import { NFTResource } from "@ledgerhq/live-common/nft/NftMetadataProvider/types"; import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets"; -import { getEnv } from "@ledgerhq/live-common/env"; -import { isEditableOperation } from "@ledgerhq/coin-framework/operation"; +// import { getEnv } from "@ledgerhq/live-common/env"; +// import { isEditableOperation } from "@ledgerhq/coin-framework/operation"; import { NavigatorName, ScreenName } from "../../const"; import LText from "../../components/LText"; @@ -47,7 +49,7 @@ import type { StackNavigatorNavigation, } from "../../components/RootNavigator/types/helpers"; import type { BaseNavigatorStackParamList } from "../../components/RootNavigator/types/BaseNavigator"; -import { EditOperationPanel } from "../../families/ethereum/EditTransactionFlow/EditOperationPanel"; +// import { EditOperationPanel } from "../../families/ethereum/EditTransactionFlow/EditOperationPanel"; type HelpLinkProps = { event: string; @@ -134,10 +136,10 @@ export default function Content({ currencySettings.confirmationsNb, ); - const isEditable = isEditableOperation(mainAccount, operation); - const isOperationStuck = - isEditable && - operation.date.getTime() <= new Date().getTime() - getEnv("ETHEREUM_STUCK_TRANSACTION_TIMEOUT"); + // const isEditable = isEditableOperation(mainAccount, operation); + // const isOperationStuck = + // isEditable && + // operation.date.getTime() <= new Date().getTime() - getEnv("ETHEREUM_STUCK_TRANSACTION_TIMEOUT"); const specific = byFamiliesOperationDetails[ @@ -322,14 +324,14 @@ export default function Content({ /> ) : null} - {isEditable ? ( + {/* {isEditable ? ( - ) : null} + ) : null} */} {!disableAllLinks ? (
Date: Fri, 11 Aug 2023 15:52:18 +0200 Subject: [PATCH 03/11] comment out updateAmountUsingMax test Untill evm bridge mock is available --- .../swap/hooks/useUpdateMaxAmount.test.ts | 263 +++++++++--------- 1 file changed, 134 insertions(+), 129 deletions(-) diff --git a/libs/ledger-live-common/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts b/libs/ledger-live-common/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts index 181d652bd8d5..bb2c4e567d76 100644 --- a/libs/ledger-live-common/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts +++ b/libs/ledger-live-common/src/exchange/swap/hooks/useUpdateMaxAmount.test.ts @@ -1,129 +1,134 @@ -import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets"; -import { act, renderHook } from "@testing-library/react-hooks"; -import BigNumber from "bignumber.js"; -import { checkAccountSupported } from "../../../account/index"; -import ethBridge from "../../../families/ethereum/bridge/mock"; -import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account"; -import { genAccount } from "../../../mock/account"; -import { useUpdateMaxAmount, ZERO } from "./useUpdateMaxAmount"; - -// Needs to be mocked since userSupportedCurrencies is initially empty. -jest.mock("../../../account/support"); -const mockedCheckAccount = jest.mocked(checkAccountSupported); -// Mock to use a custom estimate value and test the result. -jest.mock("../../../families/ethereum/bridge/mock"); -const mockedEstimateMaxSpendable = jest.mocked(ethBridge.accountBridge.estimateMaxSpendable, true); - -const ETH = getCryptoCurrencyById("ethereum"); -const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_"); - -const parentAccount = genAccount("parent-account", { - currency: ETH, -}); -const account = genTokenAccount(1, parentAccount, USDT); - -describe("updateAmountUsingMax", () => { - const setFromAmount = jest.fn(); - - const defaultProps = { - setFromAmount, - account, - parentAccount, - transaction: { amount: new BigNumber(1) } as any, - feesStrategy: "slow" as any, - }; - - beforeAll(() => { - mockedCheckAccount.mockImplementation(() => null); - }); - - afterAll(() => { - mockedCheckAccount.mockReset(); - }); - - beforeEach(() => { - setFromAmount.mockClear(); - }); - - const wait = () => new Promise(resolve => setTimeout(resolve, 500)); - - it("should toggle the amount", async () => { - const amount = new BigNumber(0.5); - mockedEstimateMaxSpendable.mockResolvedValue(amount); - const { result } = renderHook(useUpdateMaxAmount, { - initialProps: defaultProps, - }); - - expect(result.current.isMaxEnabled).toBe(false); - expect(setFromAmount).toBeCalledTimes(0); - act(() => result.current.toggleMax()); - expect(result.current.isMaxEnabled).toBe(true); - - // Lest resort solution, since waitFor and other helpers will not work here. - await wait(); - - expect(setFromAmount).toBeCalledTimes(1); - expect(setFromAmount.mock.calls[0][0]).toBe(amount); - setFromAmount.mockClear(); - - act(() => result.current.toggleMax()); - expect(result.current.isMaxEnabled).toBe(false); - - await wait(); - - expect(setFromAmount).toBeCalledTimes(1); - expect(setFromAmount.mock.calls[0][0]).toBe(ZERO); - }); - - it("should update the max amount whenever the dependencies change", async () => { - const { result, rerender } = renderHook(useUpdateMaxAmount, { - initialProps: defaultProps, - }); - - const feesGenerator = (function* feesGenerator() { - const feesArray = ["medium", "fast", "custom", "slow"]; - let index = 0; - while (true) { - yield feesArray[index]; - index = (index + 1) % feesArray.length; - } - })(); - - // setFromAmount, account, parentAccount, feesStrategy - const propsVariants = [ - { - ...defaultProps, - account: { ...account }, - }, - { - ...defaultProps, - parentAccount: { ...parentAccount }, - }, - { - ...defaultProps, - feesStrategy: feesGenerator.next().value, - }, - ]; - - // Updating dependencies when the toggle is off should not do anything. - propsVariants.forEach(rerender); - expect(setFromAmount).toBeCalledTimes(0); - - mockedEstimateMaxSpendable.mockResolvedValue(new BigNumber(0)); - act(() => result.current.toggleMax()); - await wait(); - - // Checking that updating dependencies update the max amount when the toggle is on. - let idx = 1; - for await (const props of propsVariants) { - const amount = new BigNumber(idx); - setFromAmount.mockReset(); - mockedEstimateMaxSpendable.mockResolvedValue(amount); - rerender(props); - await wait(); - expect(setFromAmount).toBeCalledTimes(1); - expect(setFromAmount.mock.calls[0][0]).toBe(amount); - idx += 1; - } - }); -}); +// import { getCryptoCurrencyById, getTokenById } from "@ledgerhq/cryptoassets"; +// import { act, renderHook } from "@testing-library/react-hooks"; +// import BigNumber from "bignumber.js"; +// import { checkAccountSupported } from "../../../account/index"; +// // FIXME: to replace with evmBridge mock when available +// // import ethBridge from "../../../families/ethereum/bridge/mock"; +// import { genTokenAccount } from "@ledgerhq/coin-framework/mocks/account"; +// import { genAccount } from "../../../mock/account"; +// import { useUpdateMaxAmount, ZERO } from "./useUpdateMaxAmount"; + +// // Needs to be mocked since userSupportedCurrencies is initially empty. +// jest.mock("../../../account/support"); +// const mockedCheckAccount = jest.mocked(checkAccountSupported); +// // Mock to use a custom estimate value and test the result. +// // FIXME: to replace with evmBridge mock when available +// // jest.mock("../../../families/ethereum/bridge/mock"); +// // const mockedEstimateMaxSpendable = jest.mocked(ethBridge.accountBridge.estimateMaxSpendable, true); + +// const ETH = getCryptoCurrencyById("ethereum"); +// const USDT = getTokenById("ethereum/erc20/usd_tether__erc20_"); + +// const parentAccount = genAccount("parent-account", { +// currency: ETH, +// }); +// const account = genTokenAccount(1, parentAccount, USDT); + +it.todo("FIX TESTS USING EVM BRIDGE MOCK WHEN AVAILABLE"); + +// FIXME: to reenable when evmBridge mock is available and test file updated +// describe("updateAmountUsingMax", () => { +// const setFromAmount = jest.fn(); + +// const defaultProps = { +// setFromAmount, +// account, +// parentAccount, +// transaction: { amount: new BigNumber(1) } as any, +// feesStrategy: "slow" as any, +// }; + +// beforeAll(() => { +// mockedCheckAccount.mockImplementation(() => null); +// }); + +// afterAll(() => { +// mockedCheckAccount.mockReset(); +// }); + +// beforeEach(() => { +// setFromAmount.mockClear(); +// }); + +// const wait = () => new Promise(resolve => setTimeout(resolve, 500)); + +// it("should toggle the amount", async () => { +// const amount = new BigNumber(0.5); +// mockedEstimateMaxSpendable.mockResolvedValue(amount); +// const { result } = renderHook(useUpdateMaxAmount, { +// initialProps: defaultProps, +// }); + +// expect(result.current.isMaxEnabled).toBe(false); +// expect(setFromAmount).toBeCalledTimes(0); +// act(() => result.current.toggleMax()); +// expect(result.current.isMaxEnabled).toBe(true); + +// // Lest resort solution, since waitFor and other helpers will not work here. +// await wait(); + +// expect(setFromAmount).toBeCalledTimes(1); +// expect(setFromAmount.mock.calls[0][0]).toBe(amount); +// setFromAmount.mockClear(); + +// act(() => result.current.toggleMax()); +// expect(result.current.isMaxEnabled).toBe(false); + +// await wait(); + +// expect(setFromAmount).toBeCalledTimes(1); +// expect(setFromAmount.mock.calls[0][0]).toBe(ZERO); +// }); + +// it("should update the max amount whenever the dependencies change", async () => { +// const { result, rerender } = renderHook(useUpdateMaxAmount, { +// initialProps: defaultProps, +// }); + +// const feesGenerator = (function* feesGenerator() { +// const feesArray = ["medium", "fast", "custom", "slow"]; +// let index = 0; +// while (true) { +// yield feesArray[index]; +// index = (index + 1) % feesArray.length; +// } +// })(); + +// // setFromAmount, account, parentAccount, feesStrategy +// const propsVariants = [ +// { +// ...defaultProps, +// account: { ...account }, +// }, +// { +// ...defaultProps, +// parentAccount: { ...parentAccount }, +// }, +// { +// ...defaultProps, +// feesStrategy: feesGenerator.next().value, +// }, +// ]; + +// // Updating dependencies when the toggle is off should not do anything. +// propsVariants.forEach(rerender); +// expect(setFromAmount).toBeCalledTimes(0); + +// mockedEstimateMaxSpendable.mockResolvedValue(new BigNumber(0)); +// act(() => result.current.toggleMax()); +// await wait(); + +// // Checking that updating dependencies update the max amount when the toggle is on. +// let idx = 1; +// for await (const props of propsVariants) { +// const amount = new BigNumber(idx); +// setFromAmount.mockReset(); +// mockedEstimateMaxSpendable.mockResolvedValue(amount); +// rerender(props); +// await wait(); +// expect(setFromAmount).toBeCalledTimes(1); +// expect(setFromAmount.mock.calls[0][0]).toBe(amount); +// idx += 1; +// } +// }); +// }); From 2625aeb8e061409dfba9d9231c9c9392847e9dbb Mon Sep 17 00:00:00 2001 From: Alexandre Chabrolin <9203826+chabroA@users.noreply.github.com> Date: Fri, 11 Aug 2023 15:56:50 +0200 Subject: [PATCH 04/11] update tests to use evm instead of ethereum as family --- .../Send/fields/RecipientField.react.test.tsx | 15 +++++++-------- libs/coin-framework/src/account/helpers.test.ts | 4 ++-- libs/coin-framework/src/operation.test.ts | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/ledger-live-desktop/src/renderer/modals/Send/fields/RecipientField.react.test.tsx b/apps/ledger-live-desktop/src/renderer/modals/Send/fields/RecipientField.react.test.tsx index 6f4820eb9283..f8408417b549 100644 --- a/apps/ledger-live-desktop/src/renderer/modals/Send/fields/RecipientField.react.test.tsx +++ b/apps/ledger-live-desktop/src/renderer/modals/Send/fields/RecipientField.react.test.tsx @@ -125,16 +125,15 @@ const baseMockTransaction: Transaction = { recipient: "", useAllAmount: false, mode: "send", - family: "ethereum", - gasPrice: null, + family: "evm", + gasPrice: undefined, maxFeePerGas: new BigNumber("28026227316"), maxPriorityFeePerGas: new BigNumber("1000000000"), - userGasLimit: null, - estimatedGasLimit: null, - feeCustomUnit: null, - networkInfo: { - family: "ethereum", - }, + customGasLimit: undefined, + nonce: 0, + gasLimit: new BigNumber("21000"), + chainId: 1, + type: 2, }; const baseMockStatus: TransactionStatus = { diff --git a/libs/coin-framework/src/account/helpers.test.ts b/libs/coin-framework/src/account/helpers.test.ts index 8a72a2445106..892ac269da7f 100644 --- a/libs/coin-framework/src/account/helpers.test.ts +++ b/libs/coin-framework/src/account/helpers.test.ts @@ -281,7 +281,7 @@ describe(isAccountEmpty.name, () => { describe("given an account", () => { beforeEach(() => { mockAccount.type = "Account"; - mockAccount.currency = { family: "ethereum" } as CryptoCurrency; + mockAccount.currency = { family: "evm" } as CryptoCurrency; }); describe("when account has no subaccounts", () => { beforeEach(() => { @@ -445,7 +445,7 @@ describe(clearAccount.name, () => { describe("given an Account", () => { const ethereumCurrency = { - family: "ethereum", + family: "evm", } as CryptoCurrency; const withSubAccounts = { ...mockAccount, diff --git a/libs/coin-framework/src/operation.test.ts b/libs/coin-framework/src/operation.test.ts index 0151f5f86ea4..90b3ad038966 100644 --- a/libs/coin-framework/src/operation.test.ts +++ b/libs/coin-framework/src/operation.test.ts @@ -95,7 +95,7 @@ describe("Operation.ts", () => { blockHeight: null, // pending transaction }; const transactionRaw = { - family: "ethereum", + family: "evm", amount: "1", recipient: "MockRecipient", }; @@ -112,7 +112,7 @@ describe("Operation.ts", () => { const account = genAccount("myAccount", { currency: ethereum }); const tokenAccount = genTokenAccount(0, account, usdc); const transactionRaw = { - family: "ethereum", + family: "evm", amount: "1", recipient: "MockRecipient", }; @@ -131,7 +131,7 @@ describe("Operation.ts", () => { const account = genAccount("myAccount", { currency: ethereum }); const tokenAccount = genTokenAccount(0, account, usdc); const transactionRaw = { - family: "ethereum", + family: "evm", amount: "1", recipient: "MockRecipient", }; @@ -153,7 +153,7 @@ describe("Operation.ts", () => { const account = genAccount("myAccount", { currency: ethereum }); const tokenAccount = genTokenAccount(0, account, usdc); const transactionRaw = { - family: "ethereum", + family: "evm", amount: "1", recipient: "MockRecipient", }; From f8c97d9f448bf371ac23b81d18cabd84f139db40 Mon Sep 17 00:00:00 2001 From: Alexandre Chabrolin <9203826+chabroA@users.noreply.github.com> Date: Fri, 11 Aug 2023 15:58:17 +0200 Subject: [PATCH 05/11] remove ethereum family files --- .../families/ethereum/AccountBodyHeader.ts | 1 - .../families/ethereum/AccountFooter.tsx | 79 - .../ethereum/AccountHeaderManageActions.ts | 51 - .../EditStuckTransactionPanelBodyHeader.tsx | 36 - .../ethereum/EditTransactionModal/Body.tsx | 271 -- .../ethereum/EditTransactionModal/index.tsx | 50 - .../EditTransactionModal/steps/StepFees.tsx | 184 - .../EditTransactionModal/steps/StepMethod.tsx | 247 -- .../steps/StepSummaryFooter.tsx | 69 - .../ethereum/EditTransactionModal/types.ts | 41 - .../families/ethereum/GasLimitField.tsx | 101 - .../families/ethereum/GasPriceField.tsx | 73 - .../families/ethereum/MaxFeeField.tsx | 158 - .../families/ethereum/PriorityFeeField.tsx | 184 - .../families/ethereum/SelectFeeStrategy.tsx | 240 -- .../families/ethereum/SendAmountFields.tsx | 69 - .../families/ethereum/StakeBanner.tsx | 77 - .../StakeFlowModal/EthStakingModalBody.tsx | 144 - .../ethereum/StakeFlowModal/StakingIcon.tsx | 55 - .../StakeFlowModal/component/ProviderItem.tsx | 114 - .../ethereum/StakeFlowModal/index.tsx | 48 - .../families/ethereum/StakeFlowModal/types.ts | 4 - .../utils/getTrackProperties.ts | 16 - .../ethereum/StepSummaryNetworkFeesRow.tsx | 71 - .../ethereum/TransactionConfirmFields.tsx | 39 - .../src/renderer/families/ethereum/helpers.ts | 37 - .../src/renderer/families/ethereum/index.ts | 35 - .../src/renderer/families/ethereum/modals.ts | 21 - .../families/ethereum/operationDetails.tsx | 78 - .../src/renderer/families/ethereum/types.ts | 6 - .../families/ethereum/CurrentNetworkFee.tsx | 104 - .../families/ethereum/EditFeeUnitEthereum.tsx | 141 - .../EditEthereumSummary.tsx | 362 -- .../EditOperationPanel.tsx | 91 - .../EditTransactionNavigator.tsx | 87 - .../EditTransactionParamList.ts | 77 - .../EditTransactionFlow/MethodSelection.tsx | 281 -- .../TransactionAlreadyValidatedError.tsx | 125 - .../Ethereum1559CustomFees.tsx | 274 -- .../EthereumLegacyCustomFees.tsx | 149 - .../ethereum/EthereumCustomFees/index.tsx | 65 - .../ethereum/EthereumCustomFees/types.ts | 8 - .../ethereum/EthereumCustomFees/utils.tsx | 60 - .../ethereum/EthereumFeesStrategy.tsx | 176 - .../ethereum/EthereumNetworkFeesInfo.tsx | 61 - .../EthereumStakingDrawerBody.tsx | 102 - .../EthereumStakingDrawerProvider.tsx | 89 - .../EthereumStakingDrawerProviderIcon.tsx | 19 - .../ethereum/EthereumStakingDrawer/index.tsx | 44 - .../ethereum/EthereumStakingDrawer/types.ts | 12 - .../families/ethereum/ScreenEditGasLimit.tsx | 113 - .../src/families/ethereum/SendRowGasLimit.tsx | 96 - .../src/families/ethereum/SendRowsFee.tsx | 8 - .../src/families/ethereum/accountActions.tsx | 84 - .../src/families/ethereum/index.ts | 4 - .../families/ethereum/operationDetails.tsx | 23 - .../src/families/ethereum/types.ts | 24 - .../bridge.integration.test.ts.snap | 3263 ----------------- .../ethereum/__tests__/hw-signMessage.test.ts | 192 - .../__tests__/modules/erc20.unit.test.ts | 23 - .../__tests__/modules/send.unit.test.ts | 904 ----- .../__tests__/nft.integration.test.ts | 140 - .../ethereum/__tests__/nft.unit.test.ts | 252 -- .../__tests__/platformAdapter.test.ts | 112 - .../ethereum/__tests__/signOperation.test.ts | 138 - .../synchronisation.integration.test.ts | 143 - .../__tests__/transaction.unit.test.ts | 145 - .../src/families/ethereum/api/api.test.ts | 95 - .../src/families/ethereum/api/index.ts | 382 -- .../src/families/ethereum/banner.test.ts | 29 - .../src/families/ethereum/banner.ts | 18 - .../ethereum/bridge.integration.test.ts | 170 - .../src/families/ethereum/bridge/js.ts | 53 - .../src/families/ethereum/bridge/mock.ts | 150 - .../src/families/ethereum/broadcast.ts | 15 - .../src/families/ethereum/cli-transaction.ts | 127 - .../families/ethereum/createTransaction.ts | 21 - .../datasets/ethereum.scanAccounts.1.ts | 48 - .../families/ethereum/datasets/ethereum1.ts | 20 - .../families/ethereum/datasets/ethereum2.ts | 20 - .../ethereum/datasets/ethereum_classic.ts | 68 - .../ethereum/deviceTransactionConfig.ts | 33 - .../families/ethereum/estimateMaxSpendable.ts | 26 - .../src/families/ethereum/exchange.ts | 16 - .../src/families/ethereum/gas.test.ts | 68 - .../src/families/ethereum/gas.ts | 117 - .../families/ethereum/getTransactionStatus.ts | 174 - .../src/families/ethereum/hw-getAddress.ts | 17 - .../src/families/ethereum/hw-signMessage.ts | 93 - .../src/families/ethereum/logic.ts | 16 - .../src/families/ethereum/modules/erc1155.ts | 167 - .../src/families/ethereum/modules/erc20.ts | 160 - .../ethereum/modules/erc20.unit.test.ts | 49 - .../src/families/ethereum/modules/erc721.ts | 145 - .../src/families/ethereum/modules/index.ts | 182 - .../src/families/ethereum/modules/send.ts | 538 --- .../src/families/ethereum/nftResolvers.ts | 82 - .../src/families/ethereum/platformAdapter.ts | 40 - .../src/families/ethereum/postSyncPatch.ts | 48 - .../families/ethereum/prepareTransaction.ts | 84 - .../src/families/ethereum/react.ts | 87 - .../src/families/ethereum/signOperation.ts | 198 - .../src/families/ethereum/specs.ts | 291 -- .../speculos-deviceActions-avalanche.ts | 53 - .../ethereum/speculos-deviceActions.ts | 81 - .../src/families/ethereum/synchronisation.ts | 713 ---- .../ethereum/synchronisation.unit.test.ts | 127 - .../src/families/ethereum/transaction.ts | 263 -- .../src/families/ethereum/types.ts | 68 - .../families/ethereum/updateTransaction.ts | 13 - .../ethereum/walletApiAdapter.test.ts | 59 - .../src/families/ethereum/walletApiAdapter.ts | 57 - 112 files changed, 15871 deletions(-) delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/AccountBodyHeader.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/AccountFooter.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/AccountHeaderManageActions.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditStuckTransactionPanelBodyHeader.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/Body.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/index.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepFees.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepMethod.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepSummaryFooter.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/types.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/GasLimitField.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/GasPriceField.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/MaxFeeField.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/PriorityFeeField.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/SelectFeeStrategy.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/SendAmountFields.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeBanner.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/EthStakingModalBody.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/StakingIcon.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/component/ProviderItem.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/index.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/types.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/utils/getTrackProperties.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/StepSummaryNetworkFeesRow.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/TransactionConfirmFields.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/helpers.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/index.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/modals.ts delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/operationDetails.tsx delete mode 100644 apps/ledger-live-desktop/src/renderer/families/ethereum/types.ts delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/CurrentNetworkFee.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditFeeUnitEthereum.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditEthereumSummary.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditOperationPanel.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditTransactionNavigator.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditTransactionParamList.ts delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/MethodSelection.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/TransactionAlreadyValidatedError.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumCustomFees/Ethereum1559CustomFees.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumCustomFees/EthereumLegacyCustomFees.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumCustomFees/index.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumCustomFees/types.ts delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumCustomFees/utils.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumFeesStrategy.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumNetworkFeesInfo.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/EthereumStakingDrawerBody.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/EthereumStakingDrawerProvider.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/EthereumStakingDrawerProviderIcon.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/index.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/types.ts delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/ScreenEditGasLimit.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/SendRowGasLimit.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/SendRowsFee.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/accountActions.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/index.ts delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/operationDetails.tsx delete mode 100644 apps/ledger-live-mobile/src/families/ethereum/types.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__snapshots__/bridge.integration.test.ts.snap delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/hw-signMessage.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/modules/erc20.unit.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/modules/send.unit.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/nft.integration.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/nft.unit.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/platformAdapter.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/signOperation.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/synchronisation.integration.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/__tests__/transaction.unit.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/api/api.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/api/index.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/banner.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/banner.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/bridge.integration.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/bridge/js.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/bridge/mock.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/broadcast.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/cli-transaction.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/createTransaction.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/datasets/ethereum.scanAccounts.1.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/datasets/ethereum1.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/datasets/ethereum2.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/datasets/ethereum_classic.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/deviceTransactionConfig.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/estimateMaxSpendable.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/exchange.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/gas.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/gas.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/getTransactionStatus.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/hw-getAddress.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/hw-signMessage.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/logic.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/modules/erc1155.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/modules/erc20.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/modules/erc20.unit.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/modules/erc721.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/modules/index.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/modules/send.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/nftResolvers.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/platformAdapter.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/postSyncPatch.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/prepareTransaction.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/react.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/signOperation.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/specs.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/speculos-deviceActions-avalanche.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/speculos-deviceActions.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/synchronisation.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/synchronisation.unit.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/transaction.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/types.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/updateTransaction.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/walletApiAdapter.test.ts delete mode 100644 libs/ledger-live-common/src/families/ethereum/walletApiAdapter.ts diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountBodyHeader.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountBodyHeader.ts deleted file mode 100644 index c07baa811e3e..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountBodyHeader.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./EditStuckTransactionPanelBodyHeader"; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountFooter.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountFooter.tsx deleted file mode 100644 index b242d3aa105d..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountFooter.tsx +++ /dev/null @@ -1,79 +0,0 @@ -import { - getAccountCurrency, - getFeesCurrency, - getFeesUnit, - getMainAccount, -} from "@ledgerhq/live-common/account/index"; -import { TransactionStatus } from "@ledgerhq/live-common/generated/types"; -import { Account, AccountLike } from "@ledgerhq/types-live"; -import React from "react"; -import { Trans, useTranslation } from "react-i18next"; -import Box from "~/renderer/components/Box"; -import CounterValue from "~/renderer/components/CounterValue"; -import { CurrencyCircleIcon } from "~/renderer/components/CurrencyBadge"; -import FormattedVal from "~/renderer/components/FormattedVal"; -import Label from "~/renderer/components/Label"; -import ToolTip from "~/renderer/components/Tooltip"; -import InfoCircle from "~/renderer/icons/InfoCircle"; - -type Props = { - account: AccountLike; - parentAccount?: Account | undefined | null; - status: TransactionStatus; -}; -const AccountFooter = ({ account, parentAccount, status }: Props) => { - const currency = getAccountCurrency(account); - const mainAccount = getMainAccount(account, parentAccount); - const feesCurrency = getFeesCurrency(mainAccount); - const feesUnit = getFeesUnit(feesCurrency); - const { t } = useTranslation(); - - return ( - <> - - - - {feesUnit && ( - <> - - - - )} - - - ); -}; -export default AccountFooter; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountHeaderManageActions.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountHeaderManageActions.ts deleted file mode 100644 index 90e7689dfa89..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/AccountHeaderManageActions.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { Account, AccountLike } from "@ledgerhq/types-live"; -import { useCallback } from "react"; -import { useDispatch } from "react-redux"; -import { useTranslation } from "react-i18next"; -import IconCoins from "~/renderer/icons/ClaimReward"; -import { openModal } from "~/renderer/actions/modals"; -import { isAccountEmpty } from "@ledgerhq/live-common/account/index"; -type Props = { - account: AccountLike; - parentAccount: Account | undefined | null; -}; -const AccountHeaderActions = ({ account, parentAccount }: Props) => { - const { t } = useTranslation(); - const dispatch = useDispatch(); - const onClick = useCallback(() => { - if (isAccountEmpty(account)) { - dispatch( - openModal("MODAL_NO_FUNDS_STAKE", { - account, - parentAccount, - }), - ); - } else if (account.type === "Account") { - dispatch( - openModal("MODAL_ETH_STAKE", { - account, - }), - ); - } - }, [account, dispatch, parentAccount]); - if (account.type === "Account" && account.currency.id === "ethereum") { - return [ - { - key: "Stake", - onClick, - event: "button_clicked", - eventProperties: { - button: "stake", - }, - icon: IconCoins, - label: t("account.stake", { - currency: account?.currency?.name, - }), - accountActionsTestId: "stake-from-account-action-button", - }, - ]; - } else { - return []; - } -}; -export default AccountHeaderActions; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditStuckTransactionPanelBodyHeader.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditStuckTransactionPanelBodyHeader.tsx deleted file mode 100644 index d4714f9978f6..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditStuckTransactionPanelBodyHeader.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React, { memo } from "react"; -import Box from "~/renderer/components/Box"; -import { useFeature } from "@ledgerhq/live-common/featureFlags/index"; -import { Account, AccountLike } from "@ledgerhq/types-live"; -import EditOperationPanel from "~/renderer/components/OperationsList/EditOperationPanel"; -import { getStuckAccountAndOperation } from "@ledgerhq/live-common/operation"; -import invariant from "invariant"; - -type Props = { - account: AccountLike; - parentAccount: Account | undefined | null; -}; - -const EditStuckTransactionPanelBodyHeader = (props: Props) => { - const { account, parentAccount } = props; - const editEthTx = useFeature("editEthTx"); - if (!editEthTx?.enabled) { - return null; - } - invariant(account, "account required"); - // for ethereum family, check if there is a stuck transaction. If so, display a warning panel with "speed up or cancel" button - const stuckAccountAndOperation = getStuckAccountAndOperation(account, parentAccount); - return ( - - {stuckAccountAndOperation ? ( - - ) : null} - - ); -}; - -export default memo(EditStuckTransactionPanelBodyHeader); diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/Body.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/Body.tsx deleted file mode 100644 index 4385d7fa2ef7..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/Body.tsx +++ /dev/null @@ -1,271 +0,0 @@ -import React, { useCallback, useState } from "react"; -import { BigNumber } from "bignumber.js"; -import { connect } from "react-redux"; -import { compose } from "redux"; -import { createStructuredSelector } from "reselect"; -import { Trans, withTranslation, TFunction } from "react-i18next"; -import { UserRefusedOnDevice } from "@ledgerhq/errors"; -import { addPendingOperation, getMainAccount } from "@ledgerhq/live-common/account/index"; -import { getAccountCurrency } from "@ledgerhq/live-common/account/helpers"; -import useBridgeTransaction from "@ledgerhq/live-common/bridge/useBridgeTransaction"; -import { Account, AccountLike, Operation } from "@ledgerhq/types-live"; -import { Transaction } from "@ledgerhq/live-common/generated/types"; -import { EIP1559ShouldBeUsed } from "@ledgerhq/live-common/families/ethereum/transaction"; -import { TransactionRaw as EthereumTransactionRaw } from "@ledgerhq/live-common/families/ethereum/types"; -import { isEditableOperation } from "@ledgerhq/live-common/operation"; -import logger from "~/renderer/logger"; -import Stepper from "~/renderer/components/Stepper"; -import { SyncSkipUnderPriority } from "@ledgerhq/live-common/bridge/react/index"; -import { closeModal, openModal } from "~/renderer/actions/modals"; -import { accountsSelector } from "~/renderer/reducers/accounts"; -import { updateAccountWithUpdater } from "~/renderer/actions/accounts"; -import { getCurrentDevice } from "~/renderer/reducers/devices"; -import { Device } from "@ledgerhq/live-common/hw/actions/types"; -import StepMethod, { StepMethodFooter } from "./steps/StepMethod"; -import StepFees, { StepFeesFooter } from "./steps/StepFees"; -import StepConnectDevice from "~/renderer/modals/Send/steps/StepConnectDevice"; -import StepSummary from "~/renderer/modals/Send/steps/StepSummary"; -import { StepSummaryFooter } from "./steps/StepSummaryFooter"; -import { fromTransactionRaw } from "@ledgerhq/live-common/transaction/index"; -import StepConfirmation, { - StepConfirmationFooter, -} from "~/renderer/modals/Send/steps/StepConfirmation"; -import { St, StepId } from "./types"; -import invariant from "invariant"; -import { getEnv } from "@ledgerhq/live-env"; - -export type Data = { - account: AccountLike | undefined | null; - parentAccount: Account | undefined | null; - recipient?: string; - amount?: BigNumber; - transaction?: Transaction; - transactionRaw: EthereumTransactionRaw; - transactionHash: string; -}; - -type OwnProps = { - stepId: StepId; - onChangeStepId: (a: StepId) => void; - onClose?: () => void | undefined; - params: Data; -}; - -type StateProps = { - t: TFunction; - device: Device | undefined | null; - accounts: Account[]; - closeModal: (a: string) => void; - openModal: (b: string, a: unknown) => void; - updateAccountWithUpdater: (b: string, a: (a: Account) => Account) => void; -}; -type Props = {} & OwnProps & StateProps; - -const createSteps = (): St[] => [ - { - id: "method", - label: , - component: StepMethod, - footer: StepMethodFooter, - }, - { - id: "fees", - label: , - component: StepFees, - footer: StepFeesFooter, - onBack: ({ transitionTo }) => transitionTo("method"), - }, - { - id: "summary", - label: , - component: StepSummary, - footer: StepSummaryFooter, - onBack: ({ transitionTo, editType }) => { - // transit to "fees" page for speedup flow and skip the "fees" page for cancel flow - transitionTo(editType === "speedup" ? "fees" : "method"); - }, - }, - { - id: "device", - label: , - component: StepConnectDevice, - onBack: ({ transitionTo }) => transitionTo("summary"), - }, - { - id: "confirmation", - label: , - excludeFromBreadcrumb: true, - component: StepConfirmation, - footer: StepConfirmationFooter, - onBack: null, - }, -]; - -const mapStateToProps = createStructuredSelector({ - device: getCurrentDevice, - accounts: accountsSelector, -}); - -const mapDispatchToProps = { - closeModal, - openModal, - updateAccountWithUpdater, -}; - -const Body = ({ - t, - device, - openModal, - closeModal, - onChangeStepId, - onClose, - stepId, - params, - accounts, - updateAccountWithUpdater, -}: Props) => { - const [steps] = useState(() => createSteps()); - const { - transaction, - setTransaction, - updateTransaction, - account, - parentAccount, - status, - bridgeError, - bridgePending, - } = useBridgeTransaction(() => { - const parentAccount = params && params.parentAccount; - const account = (params && params.account) || accounts[0]; - return { - account, - parentAccount, - transaction: fromTransactionRaw(params.transactionRaw as EthereumTransactionRaw), - }; - }); - invariant(account, "account required"); - const [optimisticOperation, setOptimisticOperation] = useState(null); - const [transactionError, setTransactionError] = useState(null); - const [signed, setSigned] = useState(false); - - const currencyName = getAccountCurrency(account).name; - - const handleCloseModal = useCallback(() => { - closeModal("MODAL_EDIT_TRANSACTION"); - }, [closeModal]); - - const handleRetry = useCallback(() => { - setTransactionError(null); - setOptimisticOperation(null); - setSigned(false); - }, []); - - const handleTransactionError = useCallback((error: Error) => { - if (!(error instanceof UserRefusedOnDevice)) { - logger.critical(error); - } - setTransactionError(error); - }, []); - - const handleOperationBroadcasted = useCallback( - (optimisticOperation: Operation) => { - const mainAccount = getMainAccount(account, parentAccount); - updateAccountWithUpdater(mainAccount.id, account => - addPendingOperation(account, optimisticOperation), - ); - setOptimisticOperation(optimisticOperation); - setTransactionError(null); - }, - [account, parentAccount, updateAccountWithUpdater], - ); - - const handleStepChange = useCallback(e => onChangeStepId(e.id), [onChangeStepId]); - const error = transactionError || bridgeError; - const mainAccount = getMainAccount(account, parentAccount); - const feePerGas = new BigNumber( - EIP1559ShouldBeUsed(mainAccount.currency) - ? (params.transactionRaw as EthereumTransactionRaw).maxFeePerGas ?? "0" - : (params.transactionRaw as EthereumTransactionRaw).gasPrice ?? "0", - ); - const feeValue = new BigNumber( - (params.transactionRaw as EthereumTransactionRaw).userGasLimit || - (params.transactionRaw as EthereumTransactionRaw).estimatedGasLimit || - 0, - ).times(feePerGas); - const haveFundToCancel = mainAccount.balance.gt( - feeValue.times(1 + getEnv("EDIT_TX_EIP1559_MAXFEE_GAP_CANCEL_FACTOR")), - ); - const haveFundToSpeedup = mainAccount.balance.gt( - feeValue - .times(1 + getEnv("EDIT_TX_EIP1559_FEE_GAP_SPEEDUP_FACTOR")) - .plus(account.type === "Account" ? new BigNumber(params.transactionRaw.amount) : 0), - ); - // log account and fees info - logger.log(`main account address: ${mainAccount.freshAddress}`); - logger.log(`main account balance: ${mainAccount.balance.toFixed()}`); - logger.log(`feeValue: ${feeValue.toFixed()}`); - logger.log(`pending transaction amount: ${params.transactionRaw.amount}`); - let isOldestEditableOperation = true; - mainAccount.pendingOperations.forEach((operation: Operation) => { - if (isEditableOperation(account, operation)) { - if ( - operation.transactionSequenceNumber !== undefined && - params.transactionRaw.nonce !== undefined && - operation.transactionSequenceNumber < params.transactionRaw.nonce - ) { - isOldestEditableOperation = false; - } - } - }); - - const [editType, setEditType] = useState( - isOldestEditableOperation && haveFundToSpeedup ? "speedup" : haveFundToCancel ? "cancel" : "", - ); - const handleSetEditType = useCallback(editType => setEditType(editType), []); - - const stepperProps = { - title: t("operation.edit.title"), - stepId, - steps, - device, - account, - parentAccount, - transaction, - signed, - currencyName, - hideBreadcrumb: false, - error, - status, - bridgePending, - optimisticOperation, - openModal, - onClose, - setSigned, - closeModal: handleCloseModal, - onChangeTransaction: setTransaction, - onRetry: handleRetry, - onStepChange: handleStepChange, - onOperationBroadcasted: handleOperationBroadcasted, - onTransactionError: handleTransactionError, - updateTransaction, - setEditType: handleSetEditType, - editType, - transactionRaw: params.transactionRaw, - transactionHash: params.transactionHash, - haveFundToSpeedup, - haveFundToCancel, - isOldestEditableOperation, - }; - - return ( - - {stepId === "confirmation" ? null : } - - ); -}; - -const m = compose( - connect(mapStateToProps, mapDispatchToProps), - withTranslation(), -)(Body) as React.ComponentType; -export default m; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/index.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/index.tsx deleted file mode 100644 index f5f2829660ef..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/index.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import React, { useCallback, useState, memo } from "react"; -import { DomainServiceProvider } from "@ledgerhq/domain-service/hooks/index"; -import Modal from "~/renderer/components/Modal"; -import Body from "./Body"; -import { Account, AccountLike, TransactionCommonRaw } from "@ledgerhq/types-live"; -import { TransactionRaw as EthereumTransactionRaw } from "@ledgerhq/live-common/families/ethereum/types"; -import { StepId } from "./types"; - -export type Props = { - account: AccountLike | undefined | null; - parentAccount: Account | undefined | null; - transactionRaw: TransactionCommonRaw; - transactionHash: string; -}; - -const EditTransactionModal = ({ - account, - parentAccount, - transactionRaw, - transactionHash, -}: Props) => { - const [stepId, setStepId] = useState("method"); - const handleReset = useCallback(() => setStepId("method"), []); - const handleStepChange = useCallback(stepId => setStepId(stepId), []); - return ( - - ( - - )} - /> - - ); -}; - -export default memo(EditTransactionModal); diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepFees.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepFees.tsx deleted file mode 100644 index 95de61c65946..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepFees.tsx +++ /dev/null @@ -1,184 +0,0 @@ -import React, { Fragment, memo, useState } from "react"; -import { Trans } from "react-i18next"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import Box from "~/renderer/components/Box"; -import Button from "~/renderer/components/Button"; -import CurrencyDownStatusAlert from "~/renderer/components/CurrencyDownStatusAlert"; -import ErrorBanner from "~/renderer/components/ErrorBanner"; -import Alert from "~/renderer/components/Alert"; -import TranslatedError from "~/renderer/components/TranslatedError"; -import SendAmountFields from "../../../../modals/Send/SendAmountFields"; -import { StepProps } from "../types"; -import { BigNumber } from "bignumber.js"; -import { EIP1559ShouldBeUsed } from "@ledgerhq/live-common/families/ethereum/transaction"; -import { TransactionRaw as EthereumTransactionRaw } from "@ledgerhq/live-common/families/ethereum/types"; -import { TransactionHasBeenValidatedError, NotEnoughGas } from "@ledgerhq/errors"; -import { apiForCurrency } from "@ledgerhq/live-common/families/ethereum/api/index"; -import logger from "~/renderer/logger"; -import { NotOwnedNft as Erc721NotOwnedNft } from "@ledgerhq/live-common/families/ethereum/modules/erc721"; -import { - NotOwnedNft as Erc1155NotOwnedNft, - NotEnoughNftOwned as Erc1155NotEnoughNftOwned, -} from "@ledgerhq/live-common/families/ethereum/modules/erc1155"; - -const StepFees = (props: StepProps) => { - const { - t, - account, - parentAccount, - transaction, - onChangeTransaction, - status, - bridgePending, - updateTransaction, - } = props; - const mainAccount = account ? getMainAccount(account, parentAccount) : null; - if (!mainAccount) return null; - const transactionRaw = props.transactionRaw as EthereumTransactionRaw; - const feePerGas = new BigNumber( - EIP1559ShouldBeUsed(mainAccount.currency) - ? transactionRaw?.maxFeePerGas ?? 0 - : transactionRaw?.gasPrice ?? 0, - ); - const feeValue = new BigNumber( - transactionRaw.userGasLimit || transactionRaw.estimatedGasLimit || 0, - ) - .times(feePerGas) - .div(new BigNumber(10).pow(mainAccount.unit.magnitude)); - // log fees info - logger.log(`transactionRaw.maxFeePerGas: ${transactionRaw.maxFeePerGas}`); - logger.log(`transactionRaw.gasPrice: ${transactionRaw.gasPrice}`); - logger.log(`transactionRaw.maxPriorityFeePerGas: ${transactionRaw.maxPriorityFeePerGas}`); - - let maxPriorityFeePerGasinGwei, maxFeePerGasinGwei, maxGasPriceinGwei; - if (EIP1559ShouldBeUsed(mainAccount.currency)) { - // dividedBy 1000000000 to convert from wei to gwei - maxPriorityFeePerGasinGwei = new BigNumber(transactionRaw?.maxPriorityFeePerGas ?? 0) - .dividedBy(1000000000) - .toFixed(); - maxFeePerGasinGwei = new BigNumber(transactionRaw?.maxFeePerGas ?? 0) - .dividedBy(1000000000) - .toFixed(); - } else { - maxGasPriceinGwei = new BigNumber(transactionRaw?.gasPrice ?? 0) - .dividedBy(1000000000) - .toFixed(); - } - - return ( - - {mainAccount ? : null} - {account && transaction && mainAccount && ( - - - - )} - - {EIP1559ShouldBeUsed(mainAccount.currency) ? ( // Display the fees info of the pending transaction (network fee, maxPriorityFeePerGas, maxFeePerGas, maxGasPrice) -
    - {t("operation.edit.previousFeesInfo.pendingTransactionFeesInfo")} -
  • {`${t("operation.edit.previousFeesInfo.networkfee")} ${feeValue} ${ - mainAccount.currency.ticker - }`}
    • -
  • {`${t( - "operation.edit.previousFeesInfo.maxPriorityFee", - )} ${maxPriorityFeePerGasinGwei} Gwei`}
    • -
  • {`${t("operation.edit.previousFeesInfo.maxFee")} ${maxFeePerGasinGwei} Gwei`}
    • -
- ) : ( -
    - {t("operation.edit.previousFeesInfo.pendingTransactionFeesInfo")} -
  • {`${t("operation.edit.previousFeesInfo.networkfee")} ${feeValue} ${ - mainAccount.currency.ticker - }`}
    • -
  • {`${t("operation.edit.previousFeesInfo.gasPrice")} ${maxGasPriceinGwei} Gwei`}
    • -
- )} - - - ); -}; - -export const StepFeesFooter: React.FC = props => { - const [transactionHasBeenValidated, setTransactionHasBeenValidated] = useState(false); - - const { - account, - parentAccount, - transaction, - transactionHash, - bridgePending, - status, - transitionTo, - } = props; - - const onNext = async () => { - transitionTo("summary"); - }; - - if (!account || !transaction || !transactionHash) { - return null; - } - - const mainAccount = getMainAccount(account, parentAccount); - if (mainAccount.currency.family !== "ethereum") { - return null; - } - - apiForCurrency(mainAccount.currency) - .getTransactionByHash(transactionHash) - .then(tx => { - if (tx?.confirmations) { - setTransactionHasBeenValidated(true); - } - }); - - const { errors } = status; - - // exclude "NotOwnedNft" and "NotEnoughNftOwned" error if it's a nft speedup operation - let errorCount = Object.keys(errors).length; - if ( - errors.amount && - ((errors.amount as Error) instanceof Erc721NotOwnedNft || - (errors.amount as Error) instanceof Erc1155NotOwnedNft || - (errors.amount as Error) instanceof Erc1155NotEnoughNftOwned) - ) { - errorCount = errorCount - 1; - } - - return ( - <> - {transactionHasBeenValidated ? ( - - ) : errors.gasPrice && errors.gasPrice instanceof NotEnoughGas ? ( - - } /> - - ) : errorCount ? ( - - } /> - - ) : null} - - - ); -}; - -export default memo(StepFees); diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepMethod.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepMethod.tsx deleted file mode 100644 index 8d59025d89cb..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepMethod.tsx +++ /dev/null @@ -1,247 +0,0 @@ -import React, { memo, useCallback, useState } from "react"; -import { Trans } from "react-i18next"; -import Box from "~/renderer/components/Box"; -import Button from "~/renderer/components/Button"; -import styled from "styled-components"; -import CheckBox from "~/renderer/components/CheckBox"; -import Text from "~/renderer/components/Text"; -import { StepProps } from "../types"; -import { BigNumber } from "bignumber.js"; -import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; -import { Flex } from "@ledgerhq/react-ui"; -import { openURL } from "~/renderer/linking"; -import { urls } from "~/config/urls"; -import { getEnv } from "@ledgerhq/live-env"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import ErrorBanner from "~/renderer/components/ErrorBanner"; -import { TransactionHasBeenValidatedError } from "@ledgerhq/errors"; -import { apiForCurrency } from "@ledgerhq/live-common/families/ethereum/api/index"; -import invariant from "invariant"; - -const EditTypeWrapper = styled(Box)<{ selected: boolean }>` - border: ${p => - `1px solid ${ - p.selected ? p.theme.colors.palette.primary.main : p.theme.colors.palette.divider - }`}; - padding: 20px 16px; - border-radius: 4px; - &:hover { - cursor: "pointer"; - } -`; -const EditTypeHeader = styled(Box)<{ selected: boolean }>` - color: ${p => - p.selected ? p.theme.colors.palette.primary.main : p.theme.colors.palette.text.shade50}; - margin-left: 10px; -`; - -const Description = styled(Box)<{ selected: boolean }>` - color: ${p => (p.selected ? "white" : "gray")}; - margin-top: 5px; - margin-left: 15px; - width: 400px; -`; - -const StepMethod = ({ - account, - editType, - setEditType, - t, - haveFundToSpeedup, - haveFundToCancel, - isOldestEditableOperation, -}: StepProps) => { - invariant(account, "account required"); - const isCancel = editType === "cancel"; - const isSpeedup = editType === "speedup"; - const disableSpeedup = !haveFundToSpeedup || !isOldestEditableOperation; - const disableCancel = !haveFundToCancel; - const handleSpeedupClick = useCallback(() => { - if (!disableSpeedup) { - setEditType("speedup"); - } - }, [disableSpeedup, setEditType]); - const handleCancelClick = useCallback(() => { - if (!disableCancel) { - setEditType("cancel"); - } - }, [disableCancel, setEditType]); - const handleLearnMoreClick = useCallback(() => { - openURL(urls.editEthTx.learnMore); - }, []); - return ( - - - - - - - - - - - - - {haveFundToSpeedup && isOldestEditableOperation ? ( - - ) : isOldestEditableOperation ? ( - - ) : ( - - )} - - - - - - - - - - - - - - - - - {haveFundToCancel ? ( - - ) : ( - - )} - - - - - - - {t("operation.edit.learnMore")} - - - ); -}; - -export const StepMethodFooter: React.FC = props => { - const [transactionHasBeenValidated, setTransactionHasBeenValidated] = useState(false); - - const { - transitionTo, - editType, - updateTransaction, - account, - parentAccount, - transactionRaw, - transaction, - transactionHash, - t, - haveFundToSpeedup, - haveFundToCancel, - isOldestEditableOperation, - } = props; - - const handleContinueClick = () => { - invariant(account && transactionRaw, "account and transactionRaw required"); - const bridge = getAccountBridge(account, parentAccount); - if (editType === "speedup") { - updateTransaction(tx => - bridge.updateTransaction(tx, { - amount: new BigNumber(transactionRaw.amount), - data: transactionRaw.data ? Buffer.from(transactionRaw.data, "hex") : undefined, - nonce: transactionRaw.nonce, - recipient: transactionRaw.recipient, - mode: transactionRaw.mode, - networkInfo: null, // force to update network fee - feesStrategy: "fast", // set "fast" as default option for speedup flow - maxFeePerGas: null, - maxPriorityFeePerGas: null, - gasPrice: null, - useAllAmount: false, - }), - ); - } else { - const mainAccount = getMainAccount(account, parentAccount); - updateTransaction(tx => - bridge.updateTransaction(tx, { - amount: new BigNumber(0), - allowZeroAmount: true, - data: undefined, - nonce: transactionRaw.nonce, - mode: "send", - recipient: mainAccount.freshAddress, - // increase gas fees in case of cancel flow as we don't have the fees input screen for cancel flow - maxFeePerGas: transactionRaw.maxFeePerGas - ? new BigNumber(transactionRaw.maxFeePerGas) - .times(1 + getEnv("EDIT_TX_EIP1559_MAXFEE_GAP_CANCEL_FACTOR")) - .integerValue() - : null, - maxPriorityFeePerGas: transactionRaw.maxPriorityFeePerGas - ? new BigNumber(transactionRaw.maxPriorityFeePerGas) - .times(1 + getEnv("EDIT_TX_EIP1559_FEE_GAP_SPEEDUP_FACTOR")) - .integerValue() - : null, - gasPrice: transactionRaw.gasPrice - ? new BigNumber(transactionRaw.gasPrice) - .times(1 + getEnv("EDIT_TX_LEGACY_GASPRICE_GAP_CANCEL_FACTOR")) - .integerValue() - : null, - feesStrategy: "custom", - useAllAmount: false, - }), - ); - } - // skip fees input screen for cancel flow - transitionTo(editType === "speedup" ? "fees" : "summary"); - }; - - if (!account || !transaction || !transactionHash) { - return null; - } - - const mainAccount = getMainAccount(account, parentAccount); - if (mainAccount.currency.family !== "ethereum") { - return null; - } - - apiForCurrency(mainAccount.currency) - .getTransactionByHash(transactionHash) - .then(tx => { - if (tx?.confirmations) { - setTransactionHasBeenValidated(true); - } - }); - - return ( - <> - {transactionHasBeenValidated ? ( - - ) : null} - - - ); -}; - -export default memo(StepMethod); diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepSummaryFooter.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepSummaryFooter.tsx deleted file mode 100644 index a5811971b10a..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/steps/StepSummaryFooter.tsx +++ /dev/null @@ -1,69 +0,0 @@ -import React, { useState } from "react"; -import { Trans } from "react-i18next"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import Button from "~/renderer/components/Button"; -import { StepProps } from "../types"; -import { apiForCurrency } from "@ledgerhq/live-common/families/ethereum/api/index"; -import ErrorBanner from "~/renderer/components/ErrorBanner"; -import { TransactionHasBeenValidatedError } from "@ledgerhq/errors"; -import { NotOwnedNft as Erc721NotOwnedNft } from "@ledgerhq/live-common/families/ethereum/modules/erc721"; -import { - NotOwnedNft as Erc1155NotOwnedNft, - NotEnoughNftOwned as Erc1155NotEnoughNftOwned, -} from "@ledgerhq/live-common/families/ethereum/modules/erc1155"; - -export const StepSummaryFooter: React.FC = props => { - const [transactionHasBeenValidated, setTransactionHasBeenValidated] = useState(false); - - const { account, parentAccount, transactionHash, status, bridgePending, transitionTo } = props; - - const onNext = async () => { - transitionTo("device"); - }; - - if (!account || !transactionHash) { - return null; - } - - const mainAccount = getMainAccount(account, parentAccount); - if (mainAccount.currency.family !== "ethereum") { - return null; - } - - apiForCurrency(mainAccount.currency) - .getTransactionByHash(transactionHash) - .then(tx => { - if (tx?.confirmations) { - setTransactionHasBeenValidated(true); - } - }); - - if (!account) { - return null; - } - - const { errors } = status; - // exclude "NotOwnedNft" and "NotEnoughNftOwned" error if it's a nft speedup operation - let errorCount = Object.keys(errors).length; - if ( - errors.amount && - ((errors.amount as Error) instanceof Erc721NotOwnedNft || - (errors.amount as Error) instanceof Erc1155NotOwnedNft || - (errors.amount as Error) instanceof Erc1155NotEnoughNftOwned) - ) { - errorCount = errorCount - 1; - } - - const canNext = !bridgePending && !errorCount && !transactionHasBeenValidated; - - return ( - <> - {transactionHasBeenValidated ? ( - - ) : null} - - - ); -}; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/types.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/types.ts deleted file mode 100644 index 2a0d8b5df33c..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/EditTransactionModal/types.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { TFunction } from "react-i18next"; -import { Account, AccountLike, Operation } from "@ledgerhq/types-live"; -import { Transaction, TransactionStatus } from "@ledgerhq/live-common/generated/types"; -import { Device } from "@ledgerhq/live-common/hw/actions/types"; -import { Step } from "~/renderer/components/Stepper"; -import { TransactionRaw as EthereumTransactionRaw } from "@ledgerhq/live-common/families/ethereum/types"; - -export type StepId = "method" | "fees" | "summary" | "device" | "confirmation"; - -export type StepProps = { - t: TFunction; - transitionTo: (a: string) => void; - device: Device | undefined | null; - account: AccountLike | undefined | null; - parentAccount: Account | undefined | null; - transaction: Transaction | undefined | null; - status: TransactionStatus; - bridgePending: boolean; - error: Error | undefined | null; - optimisticOperation: Operation | undefined | null; - closeModal: (a: void) => void; - openModal: (b: string, a: unknown) => void; - onChangeTransaction: (a: Transaction) => void; - onTransactionError: (a: Error) => void; - onOperationBroadcasted: (a: Operation) => void; - onRetry: (a: void) => void; - setSigned: (a: boolean) => void; - signed: boolean; - updateTransaction: (updater: (a: Transaction) => void) => void; - currencyName: string | undefined | null; - transactionRaw: EthereumTransactionRaw; - transactionHash: string; - editType: string | undefined | null; - haveFundToSpeedup: boolean; - haveFundToCancel: boolean; - isOldestEditableOperation: boolean; - setEditType: (a: string) => void; -}; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type St = Step; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/GasLimitField.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/GasLimitField.tsx deleted file mode 100644 index 28ad39feba9c..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/GasLimitField.tsx +++ /dev/null @@ -1,101 +0,0 @@ -import React, { useCallback, useState } from "react"; -import { - Transaction as EthereumTransaction, - TransactionStatus, -} from "@ledgerhq/live-common/families/ethereum/types"; -import { getGasLimit } from "@ledgerhq/live-common/families/ethereum/transaction"; -import { Result } from "@ledgerhq/live-common/lib/bridge/useBridgeTransaction"; -import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import { Account, AccountLike } from "@ledgerhq/types-live"; -import { useTranslation } from "react-i18next"; -import { Button } from "@ledgerhq/react-ui"; -import { BigNumber } from "bignumber.js"; -import invariant from "invariant"; -import Box from "~/renderer/components/Box"; -import Input from "~/renderer/components/Input"; -import Label from "~/renderer/components/Label"; - -type Props = { - transaction: EthereumTransaction; - account: AccountLike; - parentAccount: Account | null | undefined; - status: TransactionStatus; - updateTransaction: Result["updateTransaction"]; -}; - -const DEFAULT_GAS_LIMIT = new BigNumber(21000); - -const AdvancedOptions = ({ - account, - parentAccount, - transaction, - status, - updateTransaction, -}: Props) => { - invariant(transaction.family === "ethereum", "AdvancedOptions: ethereum family expected"); - const mainAccount = getMainAccount(account, parentAccount); - invariant(mainAccount, "Account required"); - const [editable, setEditable] = useState(false); - const { t } = useTranslation(); - - const onGasLimitChange = useCallback( - (str: string) => { - const bridge = getAccountBridge(mainAccount); - let userGasLimit = new BigNumber(str || 0); - if (!userGasLimit.isFinite()) { - userGasLimit = DEFAULT_GAS_LIMIT; - } - updateTransaction(transaction => - bridge.updateTransaction(transaction, { userGasLimit, feesStrategy: "custom" }), - ); - }, - [mainAccount, updateTransaction], - ); - - const onEditClick = useCallback(() => setEditable(true), [setEditable]); - - const gasLimit = getGasLimit(transaction); - const { gasLimit: gasLimitError } = status.errors; - const { gasLimit: gasLimitWarning } = status.warnings; - - return ( - - - - - {editable ? ( - - - - ) : ( - - - - - )} - - ); -}; - -export default AdvancedOptions; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/GasPriceField.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/GasPriceField.tsx deleted file mode 100644 index 17047dc32532..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/GasPriceField.tsx +++ /dev/null @@ -1,73 +0,0 @@ -import React, { useCallback } from "react"; -import { BigNumber } from "bignumber.js"; -import invariant from "invariant"; -import { Account, TransactionCommonRaw } from "@ledgerhq/types-live"; -import { - Transaction, - TransactionStatus, - TransactionRaw as EthereumTransactionRaw, -} from "@ledgerhq/live-common/families/ethereum/types"; -import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; -import FeeSliderField from "~/renderer/components/FeeSliderField"; -import { getEnv } from "@ledgerhq/live-env"; -import { Range, inferDynamicRange } from "@ledgerhq/live-common/range"; - -type Props = { - account: Account; - transaction: Transaction; - status: TransactionStatus; - updateTransaction: (updater: (_: Transaction) => Transaction) => void; - transactionRaw?: TransactionCommonRaw; -}; -const fallbackGasPrice = inferDynamicRange(BigNumber(10e9)); -let lastNetworkGasPrice: Range | undefined; // local cache of last value to prevent extra blinks - -const FeesField = ({ account, transaction, status, updateTransaction, transactionRaw }: Props) => { - invariant(transaction.family === "ethereum", "FeeField: ethereum family expected"); - const bridge = getAccountBridge(account); - const onGasPriceChange = useCallback( - gasPrice => { - updateTransaction(transaction => - bridge.updateTransaction(transaction, { - gasPrice, - feesStrategy: "advanced", - }), - ); - }, - [updateTransaction, bridge], - ); - const networkGasPrice = transaction.networkInfo && transaction.networkInfo.gasPrice; - if (!lastNetworkGasPrice && networkGasPrice) { - lastNetworkGasPrice = networkGasPrice; - } - let range = networkGasPrice || lastNetworkGasPrice || fallbackGasPrice; - const gasPrice = transaction.gasPrice || range.initial; - // update gas price range according to previous pending transaction if necessary - const ethTransactionRaw = transactionRaw as EthereumTransactionRaw | undefined; - if (ethTransactionRaw && ethTransactionRaw.gasPrice) { - const gaspriceGap: number = getEnv("EDIT_TX_LEGACY_GASPRICE_GAP_SPEEDUP_FACTOR"); - const minNewGasPrice = new BigNumber(ethTransactionRaw.gasPrice).times(1 + gaspriceGap); - const minValue = BigNumber.max(range.min, minNewGasPrice); - let maxValue = BigNumber.max(range.max, minNewGasPrice); - // avoid lower bound = upper bound, which will cause an error in inferDynamicRange - if (minValue.isEqualTo(maxValue)) { - maxValue = minValue.times(2); - } - range = inferDynamicRange(minValue, { - minValue, - maxValue, - }); - } - const { units } = account.currency; - return ( - 1 ? units[1] : units[0]} - error={status.errors.gasPrice} - /> - ); -}; -export default FeesField; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/MaxFeeField.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/MaxFeeField.tsx deleted file mode 100644 index 1a518da2a72d..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/MaxFeeField.tsx +++ /dev/null @@ -1,158 +0,0 @@ -import React, { useCallback, useMemo } from "react"; -import invariant from "invariant"; -import BigNumber from "bignumber.js"; -import styled from "styled-components"; -import { getEnv } from "@ledgerhq/live-env"; -import { useTranslation } from "react-i18next"; -import { - Transaction as EthereumTransaction, - TransactionRaw as EthereumTransactionRaw, -} from "@ledgerhq/live-common/families/ethereum/types"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; -import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index"; -import { AccountBridge } from "@ledgerhq/types-live"; -import { track } from "~/renderer/analytics/segment"; -import Box from "~/renderer/components/Box"; -import InputCurrency from "~/renderer/components/InputCurrency"; -import Label from "~/renderer/components/Label"; -import LabelWithExternalIcon from "~/renderer/components/LabelWithExternalIcon"; -import TranslatedError from "~/renderer/components/TranslatedError"; -import { openURL } from "~/renderer/linking"; -import { urls } from "~/config/urls"; -import { MaxFeeTooLow } from "@ledgerhq/errors"; -import { EthereumFamily } from "./types"; - -const ErrorContainer = styled(Box)<{ hasError: Error }>` - margin-top: 0px; - font-size: 10px; - width: 100%; - transition: all 0.4s ease-in-out; - will-change: max-height; - max-height: ${p => (p.hasError ? 60 : 0)}px; - min-height: ${p => (p.hasError ? 22 : 0)}px; -`; - -const ErrorDisplay = styled(Box)` - color: ${p => p.theme.colors.pearl}; -`; - -const WarningDisplay = styled(Box)` - color: ${p => p.theme.colors.warning}; -`; - -const FeesValues = styled.span` - color: ${p => p.theme.colors.neutral.c90}; -`; - -const WhiteSpacedLabel = styled(Label)` - white-space: pre; - color: ${p => p.theme.colors.neutral.c60}; -`; - -const FeesField: NonNullable["component"] = ({ - account, - parentAccount, - transaction, - status, - updateTransaction, - transactionRaw, -}) => { - invariant(transaction.family === "ethereum", "FeeField: ethereum family expected"); - - const mainAccount = getMainAccount(account, parentAccount); - const bridge: AccountBridge = getAccountBridge(mainAccount); - const { t } = useTranslation(); - - const onMaxFeeChange = useCallback( - (maxFeePerGas: BigNumber) => - updateTransaction(() => - bridge.updateTransaction(transaction, { - maxFeePerGas, - feesStrategy: "custom", - }), - ), - [bridge, transaction, updateTransaction], - ); - - const defaultMaxFeePerGas = useMemo( - () => - transaction.networkInfo?.nextBaseFeePerGas - ?.times(getEnv("EIP1559_BASE_FEE_MULTIPLIER")) - .plus(transaction?.maxPriorityFeePerGas || 0) - .integerValue(), - [transaction.maxPriorityFeePerGas, transaction.networkInfo?.nextBaseFeePerGas], - ); - - const maxFeePerGas = transaction.maxFeePerGas || defaultMaxFeePerGas; - const { units } = mainAccount.currency; - const unit = units.length > 1 ? units[1] : units[0]; - const unitName = unit.code; - - const nextBaseFeeValue = useMemo( - () => - formatCurrencyUnit(unit, transaction.networkInfo?.nextBaseFeePerGas || new BigNumber(0), { - showCode: true, - disableRounding: true, - }), - [transaction.networkInfo?.nextBaseFeePerGas, unit], - ); - - // give user an error if maxFeePerGas is lower than pending transaction maxFeePerGas + 10% of pending transaction maxPriorityFeePerGas for edit eth transaction feature - const ethTransactionRaw = transactionRaw as EthereumTransactionRaw | undefined; - if ( - !status.errors.maxFee && - ethTransactionRaw && - ethTransactionRaw.maxPriorityFeePerGas && - ethTransactionRaw.maxFeePerGas - ) { - const maxPriorityFeeGap: number = getEnv("EDIT_TX_EIP1559_FEE_GAP_SPEEDUP_FACTOR"); - const lowerLimitMaxFeePerGas = new BigNumber(ethTransactionRaw.maxFeePerGas).times( - 1 + maxPriorityFeeGap, - ); - if (transaction.maxFeePerGas && transaction.maxFeePerGas.isLessThan(lowerLimitMaxFeePerGas)) { - status.errors.maxFee = new MaxFeeTooLow(); - } - } - const validTransactionError = status.errors.maxFee; - const validTransactionWarning = status.warnings.maxFee; - return ( - - { - openURL(urls.feesEIP1559MoreInfo); - track("Send Flow EIP1559 Fees Help Requested"); - }} - label={t("send.steps.details.ethereumMaxFee", { unitName })} - /> - - - - - {validTransactionError ? ( - - - - ) : validTransactionWarning ? ( - - - - ) : null} - - - {`${t("send.steps.details.nextBlock")} : `} - {nextBaseFeeValue} - - - ); -}; - -export default FeesField; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/PriorityFeeField.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/PriorityFeeField.tsx deleted file mode 100644 index ef7ab514b75a..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/PriorityFeeField.tsx +++ /dev/null @@ -1,184 +0,0 @@ -import React, { useCallback, useMemo } from "react"; -import invariant from "invariant"; -import BigNumber from "bignumber.js"; -import styled from "styled-components"; -import { useTranslation } from "react-i18next"; -import { - Transaction as EthereumTransaction, - TransactionStatus, - TransactionRaw as EthereumTransactionRaw, -} from "@ledgerhq/live-common/families/ethereum/types"; -import { inferDynamicRange } from "@ledgerhq/live-common/range"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; -import { Result } from "@ledgerhq/live-common/bridge/useBridgeTransaction"; -import { Account, AccountBridge, AccountLike, TransactionCommonRaw } from "@ledgerhq/types-live"; -import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index"; -import LabelWithExternalIcon from "~/renderer/components/LabelWithExternalIcon"; -import TranslatedError from "~/renderer/components/TranslatedError"; -import InputCurrency from "~/renderer/components/InputCurrency"; -import { track } from "~/renderer/analytics/segment"; -import Label from "~/renderer/components/Label"; -import { openURL } from "~/renderer/linking"; -import Box from "~/renderer/components/Box"; -import { urls } from "~/config/urls"; -import { getEnv } from "@ledgerhq/live-env"; -import { PriorityFeeTooLow } from "@ledgerhq/errors"; - -const ErrorContainer = styled(Box)<{ hasError?: boolean }>` - margin-top: 0px; - font-size: 10px; - width: 100%; - transition: all 0.4s ease-in-out; - will-change: max-height; - max-height: ${p => (p.hasError ? 60 : 0)}px; - min-height: ${p => (p.hasError ? 22 : 0)}px; -`; - -const ErrorDisplay = styled(Box)` - color: ${p => p.theme.colors.pearl}; -`; - -const WarningDisplay = styled(Box)` - color: ${p => p.theme.colors.warning}; -`; - -const FeesValues = styled.span` - color: ${p => p.theme.colors.neutral.c90}; -`; - -const WhiteSpacedLabel = styled(Label)` - white-space: pre; - color: ${p => p.theme.colors.neutral.c60}; -`; - -type Props = { - account: AccountLike; - parentAccount: Account | null | undefined; - transaction: EthereumTransaction; - status: TransactionStatus; - updateTransaction: Result["updateTransaction"]; - transactionRaw?: TransactionCommonRaw; -}; - -const fallbackMaxPriorityFeePerGas = inferDynamicRange(new BigNumber(10e9)); - -const FeesField = ({ - account, - parentAccount, - transaction, - status, - updateTransaction, - transactionRaw, -}: Props) => { - invariant(transaction.family === "ethereum", "FeeField: ethereum family expected"); - const mainAccount = getMainAccount(account, parentAccount); - - const bridge: AccountBridge = getAccountBridge(mainAccount); - const { t } = useTranslation(); - - const onPriorityFeeChange = useCallback( - (maxPriorityFeePerGas: BigNumber) => - updateTransaction(transaction => - bridge.updateTransaction(transaction, { - maxPriorityFeePerGas, - feesStrategy: "custom", - }), - ), - [updateTransaction, bridge], - ); - - const networkPriorityFee = useMemo( - () => transaction.networkInfo?.maxPriorityFeePerGas || fallbackMaxPriorityFeePerGas, - [transaction.networkInfo], - ); - - const maxPriorityFee = transaction.maxPriorityFeePerGas || fallbackMaxPriorityFeePerGas.initial; - const { units } = mainAccount.currency; - const unit = units.length > 1 ? units[1] : units[0]; - const unitName = unit.code; - - let [lowPriorityFeeValue, highPriorityFeeValue] = useMemo( - () => [ - formatCurrencyUnit(unit, networkPriorityFee.min), - formatCurrencyUnit(unit, networkPriorityFee.max), - ], - [networkPriorityFee.max, networkPriorityFee.min, unit], - ); - - // update suggested max priority fee according to previous pending transaction if necessary - const ethTransactionRaw = transactionRaw as EthereumTransactionRaw | undefined; - if (ethTransactionRaw && ethTransactionRaw.maxPriorityFeePerGas) { - // update the range to make sure that new maxPriorityFeePerGas is at least 10% higher than the pending transaction - const maxPriorityFeeGap: number = getEnv("EDIT_TX_EIP1559_FEE_GAP_SPEEDUP_FACTOR"); - const newMaxPriorityFeePerGas = new BigNumber(ethTransactionRaw.maxPriorityFeePerGas).times( - 1 + maxPriorityFeeGap, - ); - const newMaxPriorityFeePerGasinGwei = formatCurrencyUnit(unit, newMaxPriorityFeePerGas); - if ( - new BigNumber(newMaxPriorityFeePerGasinGwei).isGreaterThan(new BigNumber(lowPriorityFeeValue)) - ) { - lowPriorityFeeValue = newMaxPriorityFeePerGasinGwei; - } - if ( - new BigNumber(newMaxPriorityFeePerGasinGwei).isGreaterThan( - new BigNumber(highPriorityFeeValue), - ) - ) { - highPriorityFeeValue = newMaxPriorityFeePerGasinGwei; - } - // give user an error if maxPriorityFeePerGas is lower than pending transaction maxPriorityFeePerGas + 10% for edit eth transaction feature - if ( - !status.errors.maxPriorityFee && - transaction.maxPriorityFeePerGas && - transaction.maxPriorityFeePerGas.isLessThan(newMaxPriorityFeePerGas) - ) { - status.errors.maxPriorityFee = new PriorityFeeTooLow(); - } - } - - const validTransactionError = status.errors.maxPriorityFee; - const validTransactionWarning = status.warnings.maxPriorityFee; - - return ( - - { - openURL(urls.feesEIP1559MoreInfo); - track("Send Flow EIP1559 Fees Help Requested"); - }} - label={t("send.steps.details.ethereumPriorityFee", { unitName })} - /> - - - - - {validTransactionError ? ( - - - - ) : validTransactionWarning ? ( - - - - ) : null} - - - {`${t("send.steps.details.suggested")} : `} - - {lowPriorityFeeValue} - {highPriorityFeeValue} {unitName} - - - - ); -}; - -export default FeesField; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/SelectFeeStrategy.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/SelectFeeStrategy.tsx deleted file mode 100644 index df5a6a25b5ff..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/SelectFeeStrategy.tsx +++ /dev/null @@ -1,240 +0,0 @@ -import React, { memo } from "react"; -import styled from "styled-components"; -import { BigNumber } from "bignumber.js"; -import { - getAccountCurrency, - getAccountUnit, - getMainAccount, -} from "@ledgerhq/live-common/account/index"; -import { useTranslation, Trans } from "react-i18next"; -import { Account, AccountLike, FeeStrategy, TransactionCommonRaw } from "@ledgerhq/types-live"; -import { - Transaction as EthereumTransaction, - TransactionRaw as EthereumTransactionRaw, -} from "@ledgerhq/live-common/families/ethereum/types"; -import TachometerMedium from "~/renderer/icons/TachometerMedium"; -import CounterValue from "~/renderer/components/CounterValue"; -import FormattedVal from "~/renderer/components/FormattedVal"; -import TachometerHigh from "~/renderer/icons/TachometerHigh"; -import TachometerLow from "~/renderer/icons/TachometerLow"; -import Box, { Tabbable } from "~/renderer/components/Box"; -import Text from "~/renderer/components/Text"; -import Clock from "~/renderer/icons/Clock"; -import { EIP1559ShouldBeUsed } from "@ledgerhq/live-common/families/ethereum/transaction"; -import { getEnv } from "@ledgerhq/live-env"; - -type OnClickType = { - amount: BigNumber; - feesStrategy: string; - extra?: Record; -}; - -type Props = { - onClick: (arg: OnClickType) => void; - transaction: EthereumTransaction; - account: AccountLike; - parentAccount: Account | null | undefined; - strategies: FeeStrategy[]; - mapStrategies?: (arg: FeeStrategy) => FeeStrategy; - suffixPerByte?: boolean; - transactionRaw?: TransactionCommonRaw; -}; - -const FeesWrapper = styled(Tabbable)` - flex-direction: column; - align-items: center; - justify-content: space-between; - gap: 6px; - - border: ${p => - `1px solid ${ - p?.selected ? p.theme.colors.palette.primary.main : p.theme.colors.palette.divider - }`}; - padding: 20px 16px; - font-family: "Inter"; - border-radius: 4px; - width: 140px; - ${p => (p.disabled ? `background: ${p.theme.colors.palette.background.default};` : "")}; - - &:hover { - cursor: ${p => (p.disabled ? "unset" : "pointer")}; - } -`; - -const FeesHeader = styled(Box)<{ selected?: boolean; disabled?: boolean }>` - color: ${p => - p.selected - ? p.theme.colors.palette.primary.main - : p.disabled - ? p.theme.colors.palette.text.shade20 - : p.theme.colors.palette.text.shade50}; -`; - -const FeesValue = styled(Box)` - flex-direction: column; - align-items: center; - text-align: center; -`; - -const ApproximateTransactionTime = styled(Box)<{ selected?: boolean }>` - flex-direction: row; - align-items: center; - border-radius: 3px; - background-color: ${p => - p.selected ? p.theme.colors.palette.primary.main : p.theme.colors.palette.text.shade20}; - padding: 5px 6px; -`; - -const SelectFeeStrategy = ({ - transaction, - account, - parentAccount, - onClick, - strategies, - mapStrategies, - suffixPerByte, - transactionRaw, -}: Props) => { - const mainAccount = getMainAccount(account, parentAccount); - const accountUnit = getAccountUnit(mainAccount); - const feesCurrency = getAccountCurrency(mainAccount); - const { t } = useTranslation(); - strategies = mapStrategies ? strategies.map(mapStrategies) : strategies; - if (transactionRaw) { - // disable low transaction fee options in case of edit transaction modal - const ethTransactionRaw = transactionRaw as EthereumTransactionRaw; - if (EIP1559ShouldBeUsed(mainAccount.currency)) { - const oldMaxPriorityFeePerGas = ethTransactionRaw.maxPriorityFeePerGas; - const oldMaxFeePerGas = ethTransactionRaw.maxFeePerGas; - const feesGap: number = getEnv("EDIT_TX_EIP1559_FEE_GAP_SPEEDUP_FACTOR"); - strategies.forEach(strategy => { - const strategyMaxPriorityFeePerGas = strategy.extra?.maxPriorityFeePerGas; - const strategyMaxFeePerGas = strategy.extra?.maxFeePerGas; - if ( - oldMaxPriorityFeePerGas && - strategyMaxPriorityFeePerGas && - oldMaxFeePerGas && - strategyMaxFeePerGas - ) { - // MaxPriorityFee should be at least 10% higher than the old one - // MaxFee should be at least old MaxFee + 10% of old MaxPriorityFee - strategy.disabled = - strategy.disabled || - strategyMaxPriorityFeePerGas.isLessThan( - BigNumber(oldMaxPriorityFeePerGas).times(1 + feesGap), - ) || - strategyMaxFeePerGas.isLessThan(BigNumber(oldMaxFeePerGas).times(1 + feesGap)); - } - }); - } else { - const gaspriceGap: number = getEnv("EDIT_TX_LEGACY_GASPRICE_GAP_SPEEDUP_FACTOR"); - const oldGasPrice = ethTransactionRaw.gasPrice; - if (oldGasPrice) { - strategies.forEach(strategy => { - strategy.disabled = - strategy.disabled || - strategy.amount.isLessThan(BigNumber(oldGasPrice).times(1 + gaspriceGap)); - }); - } - } - } - - return ( - - {strategies.map(strategy => { - const amount = strategy.displayedAmount || strategy.amount; - const { label, disabled } = strategy; - const selected = transaction.feesStrategy === strategy.label && !disabled; - - return ( - { - !disabled && - onClick({ - amount: strategy.amount, - feesStrategy: label, - extra: strategy.extra, - }); - }} - > - <> - - {label === "medium" ? ( - - ) : label === "slow" ? ( - - ) : ( - - )} - - - - - - - {strategy.displayedAmount ? ( - - ) : null} - - {feesCurrency.id === "ethereum" && ( - - - - {label === "medium" ? ( - <> - ≈ 30 - - ) : label === "slow" ? ( - <> - ≈ 2-3 - - ) : ( - <> - ≈ 15 - - )} - - - )} - - - ); - })} - - ); -}; - -export default memo(SelectFeeStrategy); diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/SendAmountFields.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/SendAmountFields.tsx deleted file mode 100644 index c26052aed349..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/SendAmountFields.tsx +++ /dev/null @@ -1,69 +0,0 @@ -import { getAccountBridge } from "@ledgerhq/live-common/bridge/index"; -import { useFeesStrategy } from "@ledgerhq/live-common/families/ethereum/react"; -import { EIP1559ShouldBeUsed } from "@ledgerhq/live-common/families/ethereum/transaction"; -import { Transaction as EthereumTransaction } from "@ledgerhq/live-common/families/ethereum/types"; -import { AccountBridge } from "@ledgerhq/types-live"; -import React, { useCallback, useState } from "react"; -import SendFeeMode from "~/renderer/components/SendFeeMode"; -import { ContextValue, context } from "~/renderer/drawers/Provider"; -import GasLimitField from "./GasLimitField"; -import GasPriceField from "./GasPriceField"; -import MaxFeeField from "./MaxFeeField"; -import PriorityFeeField from "./PriorityFeeField"; -import SelectFeeStrategy from "./SelectFeeStrategy"; -import { EthereumFamily } from "./types"; - -const Root: NonNullable["component"] = props => { - const { account, updateTransaction, transaction } = props; - const bridge: AccountBridge = getAccountBridge(account); - const { state: drawerState, setDrawer } = React.useContext(context); - - const defaultStrategies = useFeesStrategy(transaction); - const [isAdvanceMode, setAdvanceMode] = useState(!transaction.feesStrategy); - const strategies = defaultStrategies; - - const onFeeStrategyClick = useCallback( - ({ amount, feesStrategy, extra }) => { - updateTransaction((tx: EthereumTransaction) => - bridge.updateTransaction(tx, { - gasPrice: amount, - maxFeePerGas: extra?.maxFeePerGas, - maxPriorityFeePerGas: extra?.maxPriorityFeePerGas, - feesStrategy, - }), - ); - if (drawerState.open) setDrawer(undefined); - }, - // eslint-disable-next-line react-hooks/exhaustive-deps - [updateTransaction, bridge], - ); - - return ( - <> - - {isAdvanceMode ? ( - EIP1559ShouldBeUsed(account.currency) ? ( - <> - - - - - ) : ( - <> - - - - ) - ) : ( - <> - - - )} - - ); -}; - -export default { - component: Root, - fields: ["feeStrategy", "gasLimit", "gasPrice"], -}; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeBanner.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeBanner.tsx deleted file mode 100644 index cb4a8b8a7d19..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeBanner.tsx +++ /dev/null @@ -1,77 +0,0 @@ -import { Account } from "@ledgerhq/types-live"; -import { useHistory } from "react-router"; -import { useTranslation } from "react-i18next"; -import useFeature from "@ledgerhq/live-common/featureFlags/useFeature"; -import { getAccountBannerState as getEthereumBannerState } from "@ledgerhq/live-common/families/ethereum/banner"; -import { AccountBanner } from "~/renderer/screens/account/AccountBanner"; -import { track } from "~/renderer/analytics/segment"; -import { stakeDefaultTrack } from "~/renderer/screens/stake/constants"; -import React from "react"; -import { StakeAccountBannerParams } from "~/renderer/screens/account/types"; - -const kilnAppId = "kiln"; -const lidoAppId = "lido"; - -const StakeBanner: React.FC<{ account: Account }> = ({ account }) => { - const history = useHistory(); - const { t } = useTranslation(); - const stakeAccountBanner = useFeature("stakeAccountBanner"); - const ethStakingProviders = useFeature("ethStakingProviders"); - const stakeAccountBannerParams: StakeAccountBannerParams | null = - stakeAccountBanner?.params ?? null; - const state = getEthereumBannerState(account); - const { stakeProvider } = state; - - if (stakeProvider === "lido" && !stakeAccountBannerParams?.eth?.lido) return null; - if (stakeProvider === "kiln" && !stakeAccountBannerParams?.eth?.kiln) return null; - const stakeOnClick = (providerLiveAppId: string) => { - track("button_clicked", { - ...stakeDefaultTrack, - delegation: "stake", - page: "Page Account", - button: "delegate", - provider: stakeProvider, - currency: "ETH", - }); - history.push({ - pathname: `/platform/${providerLiveAppId}`, - state: { accountId: account.id, returnTo: `/account/${account.id}` }, - }); - }; - - const title = - stakeProvider === "kiln" - ? t("account.banner.delegation.ethereum.kiln.title") - : t("account.banner.delegation.ethereum.lido.title"); - const description = - stakeProvider === "kiln" - ? t("account.banner.delegation.ethereum.kiln.description") - : t("account.banner.delegation.ethereum.lido.description"); - const cta = - stakeProvider === "kiln" - ? t("account.banner.delegation.ethereum.kiln.cta") - : t("account.banner.delegation.ethereum.lido.cta"); - - const onClick = - stakeProvider === "kiln" ? () => stakeOnClick(kilnAppId) : () => stakeOnClick(lidoAppId); - - const display = ethStakingProviders?.params?.listProvider?.some( - (provider: { liveAppId: string }) => provider.liveAppId === stakeProvider, - ); - - if (!display) return null; - - return ( - - ); -}; - -export default StakeBanner; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/EthStakingModalBody.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/EthStakingModalBody.tsx deleted file mode 100644 index 588b5c03c7ac..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/EthStakingModalBody.tsx +++ /dev/null @@ -1,144 +0,0 @@ -import React, { useCallback, useState } from "react"; -import { Account } from "@ledgerhq/types-live"; -import { useHistory } from "react-router-dom"; -import { Flex, Text } from "@ledgerhq/react-ui"; - -import { track } from "~/renderer/analytics/segment"; -import { useTranslation } from "react-i18next"; -import { openURL } from "~/renderer/linking"; -import { - LOCAL_STORAGE_KEY_PREFIX, - CheckBoxContainer, -} from "~/renderer/modals/Receive/steps/StepReceiveStakingFlow"; -import CheckBox from "~/renderer/components/CheckBox"; -import { appendQueryParamsToDappURL } from "@ledgerhq/live-common/platform/utils/appendQueryParamsToDappURL"; -import EthStakeIllustration from "~/renderer/icons/EthStakeIllustration"; -import { ListProvider, ListProviders } from "./types"; -import { getTrackProperties } from "./utils/getTrackProperties"; - -import ProviderItem from "./component/ProviderItem"; -import { LiveAppManifest } from "@ledgerhq/live-common/platform/types"; - -type Props = { - account: Account; - singleProviderRedirectMode?: boolean; - onClose?: () => void; - hasCheckbox?: boolean; - source?: string; - listProviders?: ListProviders; -}; - -export type StakeOnClickProps = { - provider: ListProvider; - manifest: LiveAppManifest; -}; - -export function EthStakingModalBody({ - hasCheckbox = false, - singleProviderRedirectMode = true, - source, - onClose, - account, - listProviders = [], -}: Props) { - const { t } = useTranslation(); - const history = useHistory(); - const [doNotShowAgain, setDoNotShowAgain] = useState(false); - - const stakeOnClick = useCallback( - ({ - provider: { liveAppId, id: providerConfigID, queryParams }, - manifest, - }: StakeOnClickProps) => { - const value = `/platform/${liveAppId}`; - const customDappUrl = queryParams && appendQueryParamsToDappURL(manifest, queryParams); - track("button_clicked", { - button: providerConfigID, - ...getTrackProperties({ value, modal: source }), - }); - history.push({ - pathname: value, - ...(customDappUrl ? { customDappUrl } : {}), - state: { - accountId: account.id, - }, - }); - onClose?.(); - }, - [history, account.id, onClose, source], - ); - - const infoOnClick = useCallback(({ supportLink, id: providerConfigID }: ListProvider) => { - if (supportLink) { - track("button_clicked", { - button: `learn_more_${providerConfigID}`, - ...getTrackProperties({ value: supportLink }), - link: supportLink, - }); - openURL(supportLink, "OpenURL", getTrackProperties({ value: supportLink })); - } - }, []); - - const redirectIfOnlyProvider = useCallback( - (stakeOnClickProps: StakeOnClickProps) => { - if (singleProviderRedirectMode && listProviders.length === 1) { - stakeOnClick(stakeOnClickProps); - } - }, - [singleProviderRedirectMode, listProviders.length, stakeOnClick], - ); - - const checkBoxOnChange = useCallback(() => { - const value = !doNotShowAgain; - global.localStorage.setItem(`${LOCAL_STORAGE_KEY_PREFIX}${account?.currency?.id}`, `${value}`); - setDoNotShowAgain(value); - track("button_clicked", { - button: "not_show", - ...getTrackProperties({ value, modal: source }), - }); - }, [doNotShowAgain, account?.currency?.id, source]); - - return ( - - - - {t("ethereum.stake.title")} - - {listProviders.length <= 1 && ( - - - - )} - - {t("ethereum.stake.subTitle")} - - - - - {listProviders.map(item => ( - - - - ))} - - {hasCheckbox && ( - - - - )} - - - ); -} diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/StakingIcon.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/StakingIcon.tsx deleted file mode 100644 index ea9c62668ee2..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/StakingIcon.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import React from "react"; -import { CryptoIcon, Icon } from "@ledgerhq/react-ui"; -import ProviderIcon from "~/renderer/components/ProviderIcon"; -import styled from "styled-components"; - -type Props = { - icon?: string; -}; - -const IconContainer = styled.div( - ({ theme }) => ` - display: flex; - justify-content: center; - align-items: center; - width: ${theme.space[6]}px; - height: ${theme.space[6]}px; - border-radius: 100%; - background-color: ${theme.colors.opacityDefault.c05}; - margin-top: ${theme.space[3]}px; -`, -); - -const ProviderIconContainer = styled.div( - ({ theme }) => ` - margin-top: ${theme.space[1]}px; -`, -); - -export function StakingIcon({ icon }: Props) { - if (!icon) return null; - - const [iconName, iconType] = icon.split(":"); - - // if no icon type then treat as "normal" icon. - if (!iconType) { - return ( - - - - ); - } - - if (iconType === "crypto") { - return ; - } - if (iconType === "provider") { - return ( - - - - ); - } - - return null; -} diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/component/ProviderItem.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/component/ProviderItem.tsx deleted file mode 100644 index 9b43d5dd91fe..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/component/ProviderItem.tsx +++ /dev/null @@ -1,114 +0,0 @@ -import React, { useCallback, useEffect, useMemo } from "react"; -import { Flex, Text, IconsLegacy, Link, Icon, Tag as TagCore } from "@ledgerhq/react-ui"; -import { useLocalLiveAppManifest } from "@ledgerhq/live-common/platform/providers/LocalLiveAppProvider/index"; -import { useRemoteLiveAppManifest } from "@ledgerhq/live-common/platform/providers/RemoteLiveAppProvider/index"; -import { useTranslation } from "react-i18next"; -import styled, { DefaultTheme, StyledComponent } from "styled-components"; -import { ListProvider } from "../types"; -import { StakeOnClickProps } from "../EthStakingModalBody"; -import { StakingIcon } from "../StakingIcon"; - -export const Container: StyledComponent< - "div", - DefaultTheme, - Record, - never -> = styled(Flex)` - cursor: pointer; - border-radius: 8px; - :hover { - background-color: ${p => p.theme.colors.primary.c10}; - } -`; - -export const Tag = styled(TagCore)` - padding: 3px 6px; - > span { - font-size: 11px; - text-transform: none; - font-weight: bold; - line-height: 11.66px; - } -`; - -type Props = { - provider: ListProvider; - infoOnClick(_: ListProvider): void; - stakeOnClick(_: StakeOnClickProps): void; - redirectIfOnlyProvider(_: StakeOnClickProps): void; -}; - -const ProviderItem = ({ provider, infoOnClick, stakeOnClick, redirectIfOnlyProvider }: Props) => { - const { t, i18n } = useTranslation(); - - const localManifest = useLocalLiveAppManifest(provider.liveAppId); - const remoteManifest = useRemoteLiveAppManifest(provider.liveAppId); - - const manifest = useMemo(() => remoteManifest || localManifest, [localManifest, remoteManifest]); - - const hasTag = i18n.exists(`ethereum.stake.${provider.id}.tag`); - - useEffect(() => { - if (manifest) redirectIfOnlyProvider({ provider, manifest }); - }, [redirectIfOnlyProvider, provider, manifest]); - - const stakeLink = useCallback(() => { - if (manifest) stakeOnClick({ provider, manifest }); - }, [provider, stakeOnClick, manifest]); - - const infoLink = useCallback( - (event: React.MouseEvent) => { - infoOnClick(provider); - event.stopPropagation(); - }, - [infoOnClick, provider], - ); - - return ( - - - - - - {t(`ethereum.stake.${provider.id}.title`)} - - {hasTag && ( - - {t(`ethereum.stake.${provider.id}.tag`)} - - )} - - - - {t(`ethereum.stake.${provider.id}.description`)} - - - {t(`ethereum.stake.${provider.id}.supportLink`)} - - - - - - - ); -}; - -export default ProviderItem; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/index.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/index.tsx deleted file mode 100644 index 6ebd504ec3e8..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/index.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import React from "react"; -import { Account } from "@ledgerhq/types-live"; -import { useFeature } from "@ledgerhq/live-common/featureFlags/index"; -import { EthStakingProviders } from "~/types/featureFlags"; -import Modal, { ModalBody } from "~/renderer/components/Modal"; -import { Flex } from "@ledgerhq/react-ui"; -import TrackPage from "~/renderer/analytics/TrackPage"; -import { EthStakingModalBody } from "./EthStakingModalBody"; - -type Props = { - account: Account; - singleProviderRedirectMode?: boolean; - source?: string; - hasCheckbox?: boolean; -}; -const DelegationModal = ({ account, hasCheckbox, singleProviderRedirectMode, source }: Props) => { - const ethStakingProviders = useFeature("ethStakingProviders"); - - if (!ethStakingProviders?.enabled) return null; - - return ( - ( - ( - - - - - )} - /> - )} - /> - ); -}; -export default DelegationModal; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/types.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/types.ts deleted file mode 100644 index 8471da6a627b..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/types.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { EthStakingProviders } from "~/types/featureFlags"; - -export type ListProviders = EthStakingProviders["listProvider"]; -export type ListProvider = ListProviders[number]; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/utils/getTrackProperties.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/utils/getTrackProperties.ts deleted file mode 100644 index 0911256c5aa3..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StakeFlowModal/utils/getTrackProperties.ts +++ /dev/null @@ -1,16 +0,0 @@ -type Props = { - value: string | boolean; - modal?: string; -}; - -export function getTrackProperties({ value, modal = "stake" }: Props) { - return { - path: window.location.hash - .split("/") - .filter(e => e !== "#") - .join("/"), - modal, - flow: "stake", - value, - }; -} diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/StepSummaryNetworkFeesRow.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/StepSummaryNetworkFeesRow.tsx deleted file mode 100644 index 09ce6328edcc..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/StepSummaryNetworkFeesRow.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import React from "react"; -import { Trans, useTranslation } from "react-i18next"; -import Box from "~/renderer/components/Box"; -import CounterValue from "~/renderer/components/CounterValue"; -import FormattedVal from "~/renderer/components/FormattedVal"; -import Text from "~/renderer/components/Text"; -import IconExclamationCircle from "~/renderer/icons/ExclamationCircle"; -import TranslatedError from "~/renderer/components/TranslatedError"; -import { SummaryNetworkFeesRowProps } from "../types"; -import ToolTip from "~/renderer/components/Tooltip"; -import InfoCircle from "~/renderer/icons/InfoCircle"; - -const StepSummaryNetworkFeesRow = ({ - feeTooHigh, - feesUnit, - estimatedFees, - feesCurrency, -}: SummaryNetworkFeesRowProps) => { - const { t } = useTranslation(); - - return ( - <> - - - {" "} - - - - - - - - - - - - {feeTooHigh ? ( - - - - - - - ) : null} - - ); -}; - -export default StepSummaryNetworkFeesRow; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/TransactionConfirmFields.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/TransactionConfirmFields.tsx deleted file mode 100644 index 5a86525dc953..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/TransactionConfirmFields.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import React from "react"; -import { Trans } from "react-i18next"; -import { Transaction } from "@ledgerhq/live-common/families/ethereum/types"; -import WarnBox from "~/renderer/components/WarnBox"; - -const Warning = ({ - transaction, - recipientWording, -}: { - transaction: Transaction; - recipientWording: string; -}) => { - switch (transaction.mode) { - case "erc20.approve": - return ( - - - - ); - default: - return transaction.data ? ( - - - - ) : ( - - - - ); - } -}; -export default { - warning: Warning, -}; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/helpers.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/helpers.ts deleted file mode 100644 index bfe2119ca8bb..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/helpers.ts +++ /dev/null @@ -1,37 +0,0 @@ -import BigNumber from "bignumber.js"; -import { - Transaction as EthereumTransaction, - TransactionMode, -} from "@ledgerhq/live-common/families/ethereum/types"; -import { AnyMessage, NFTStandard } from "@ledgerhq/types-live"; -import { getEIP712FieldsDisplayedOnNano } from "@ledgerhq/evm-tools/message/EIP712/index"; -import { MessageProperties, NftProperties } from "../types"; -import { getEnv } from "@ledgerhq/live-env"; - -export const getNftTransactionProperties = (transaction: EthereumTransaction): NftProperties => ({ - tokenId: transaction?.tokenIds?.[0] || null, - contract: transaction?.collection || null, - quantity: transaction?.quantities?.[0] || null, -}); - -export const injectNftIntoTransaction = ( - transaction: EthereumTransaction, - nftProperties: Partial, - standard?: NFTStandard, -): EthereumTransaction => ({ - ...transaction, - mode: standard ? (`${standard.toLowerCase()}.transfer` as TransactionMode) : transaction.mode, - collection: nftProperties?.contract ?? transaction?.collection ?? "", - tokenIds: [nftProperties?.tokenId ?? transaction.tokenIds?.[0] ?? ""], - quantities: [nftProperties?.quantity ?? transaction.quantities?.[0] ?? new BigNumber(NaN)], -}); - -export const getMessageProperties = async ( - messageData: AnyMessage, -): Promise => { - if (messageData.standard === "EIP712") { - return getEIP712FieldsDisplayedOnNano(messageData.message, getEnv("DYNAMIC_CAL_BASE_URL")); - } - - return null; -}; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/index.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/index.ts deleted file mode 100644 index 1906688830d1..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -import accountHeaderManageActions from "./AccountHeaderManageActions"; -import AccountBodyHeader from "./AccountBodyHeader"; -import sendAmountFields from "./SendAmountFields"; -import StakeBanner from "./StakeBanner"; -import transactionConfirmFields from "./TransactionConfirmFields"; -import operationDetails from "./operationDetails"; -import AccountFooter from "./AccountFooter"; -import StepSummaryNetworkFeesRow from "./StepSummaryNetworkFeesRow"; -import { - getNftTransactionProperties, - injectNftIntoTransaction, - getMessageProperties, -} from "./helpers"; - -import { EthereumFamily } from "./types"; - -const family: EthereumFamily = { - AccountFooter, - operationDetails, - accountHeaderManageActions, - transactionConfirmFields, - AccountBodyHeader, - sendAmountFields, - StepSummaryNetworkFeesRow, - StakeBanner, - nft: { - getNftTransactionProperties, - injectNftIntoTransaction, - }, - message: { - getMessageProperties, - }, -}; - -export default family; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/modals.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/modals.ts deleted file mode 100644 index ce05281c7cf3..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/modals.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { MakeModalsType } from "~/renderer/modals/types"; -import MODAL_ETH_STAKE from "./StakeFlowModal"; -import MODAL_EDIT_TRANSACTION, { Props as EditTransactionProps } from "./EditTransactionModal"; -import { Account } from "@ledgerhq/types-live"; - -export type ModalsData = { - MODAL_ETH_STAKE: { - account: Account; - hasCheckbox?: boolean; - singleProviderRedirectMode?: boolean; - source?: string; - }; - MODAL_EDIT_TRANSACTION: EditTransactionProps; -}; - -const modals: MakeModalsType = { - MODAL_ETH_STAKE, - MODAL_EDIT_TRANSACTION, -}; - -export default modals; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/operationDetails.tsx b/apps/ledger-live-desktop/src/renderer/families/ethereum/operationDetails.tsx deleted file mode 100644 index 530a14cf682d..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/operationDetails.tsx +++ /dev/null @@ -1,78 +0,0 @@ -import React, { useMemo } from "react"; -import styled from "styled-components"; -import toPairs from "lodash/toPairs"; -import { Trans } from "react-i18next"; -import { AccountLike, NFTMetadataResponse, Operation } from "@ledgerhq/types-live"; -import { useNftMetadata } from "@ledgerhq/live-common/nft/index"; -import { decodeAccountId } from "@ledgerhq/live-common/account/index"; -import { centerEllipsis } from "~/renderer/styles/helpers"; -import Box from "~/renderer/components/Box"; -import Skeleton from "~/renderer/components/Nft/Skeleton"; -import Text from "~/renderer/components/Text"; -import { - OpDetailsTitle, - OpDetailsData, - OpDetailsSection, -} from "~/renderer/drawers/OperationDetails/styledComponents"; -import Ellipsis from "~/renderer/components/Ellipsis"; - -type OperationDetailsExtraProps = { - extra: { - [key: string]: string; - }; - type: string; - account: AccountLike | undefined | null; -}; -const OperationDetailsExtra = ({ extra }: OperationDetailsExtraProps) => { - const entries = toPairs(extra); - const jsx = entries.map(([key, value]) => ( - - - - - - {value} - - - )); - return <>{jsx}; -}; -type Props = { - operation: Operation; -}; -const Cell = styled(Box).attrs(() => ({ - horizontal: false, - alignItems: "flex-end", -}))` - flex: 0 0 auto; - text-align: right; - justify-content: center; - min-width: 150px; -`; -const NFTAmountField = ({ operation }: Props) => { - const { currencyId } = decodeAccountId(operation.accountId); - const { status, metadata } = useNftMetadata(operation.contract, operation.tokenId, currencyId); - const show = useMemo(() => status === "loading", [status]); - return ( - - - - {(metadata as NFTMetadataResponse["result"])?.nftName || "-"} - - - - - {centerEllipsis(operation?.tokenId)} - - - - ); -}; -const amountCell = { - NFT_OUT: NFTAmountField, - NFT_IN: NFTAmountField, -}; -export default { - OperationDetailsExtra, - amountCell, -}; diff --git a/apps/ledger-live-desktop/src/renderer/families/ethereum/types.ts b/apps/ledger-live-desktop/src/renderer/families/ethereum/types.ts deleted file mode 100644 index 341f2eea4e19..000000000000 --- a/apps/ledger-live-desktop/src/renderer/families/ethereum/types.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { Transaction, TransactionStatus } from "@ledgerhq/live-common/families/ethereum/types"; - -import { Account } from "@ledgerhq/types-live"; -import { LLDCoinFamily } from "../types"; - -export type EthereumFamily = LLDCoinFamily; diff --git a/apps/ledger-live-mobile/src/families/ethereum/CurrentNetworkFee.tsx b/apps/ledger-live-mobile/src/families/ethereum/CurrentNetworkFee.tsx deleted file mode 100644 index 3c20ca643f67..000000000000 --- a/apps/ledger-live-mobile/src/families/ethereum/CurrentNetworkFee.tsx +++ /dev/null @@ -1,104 +0,0 @@ -import React, { memo } from "react"; -import { TransactionRaw } from "@ledgerhq/live-common/families/ethereum/types"; -import BigNumber from "bignumber.js"; -import { - EIP1559ShouldBeUsed, - fromTransactionRaw, -} from "@ledgerhq/live-common/families/ethereum/transaction"; -import { useTranslation } from "react-i18next"; -import type { Account, AccountLike, TransactionCommonRaw } from "@ledgerhq/types-live"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import { View } from "react-native"; -import { log } from "@ledgerhq/logs"; - -import Alert from "../../components/Alert"; -import LText from "../../components/LText"; - -const CurrentNetworkFeeComponent = ({ - account, - parentAccount, - transactionRaw, - advancedMode = false, -}: { - account: AccountLike; - parentAccount: Account | null | undefined; - transactionRaw?: TransactionCommonRaw; - advancedMode?: boolean; -}) => { - const { t } = useTranslation(); - - if (transactionRaw) { - const transaction = fromTransactionRaw(transactionRaw as TransactionRaw); - - log("Edit Transaction", `transactionRaw.maxFeePerGas: ${transaction.maxFeePerGas}`); - log("Edit Transaction", `transactionRaw.gasPrice: ${transaction.gasPrice}`); - log( - "Edit Transaction", - `transactionRaw.maxPriorityFeePerGas: ${transaction.maxPriorityFeePerGas}`, - ); - - const mainAccount = getMainAccount(account, parentAccount); - const feePerGas = new BigNumber( - EIP1559ShouldBeUsed(mainAccount.currency) ? transaction.maxFeePerGas! : transaction.gasPrice!, - ); - - const feeValue = new BigNumber(transaction.userGasLimit || transaction.estimatedGasLimit || 1) - .times(feePerGas) - .div(new BigNumber(10).pow(mainAccount.unit.magnitude)); - - if (advancedMode) { - const maxPriorityFeePerGasinGwei = new BigNumber(transaction.maxPriorityFeePerGas ?? 0) - .dividedBy(1_000_000_000) - .toFixed(); - - const maxFeePerGasinGwei = new BigNumber(transaction.maxFeePerGas ?? 0) - .dividedBy(1_000_000_000) - .toFixed(); - - const maxGasPriceinGwei = new BigNumber(transaction?.gasPrice ?? 0) - .dividedBy(1_000_000_000) - .toFixed(); - - return ( - - {EIP1559ShouldBeUsed(mainAccount.currency) ? ( - - - {t("editTransaction.previousFeesInfo.maxPriorityFee", { - amount: maxPriorityFeePerGasinGwei, - })} - - - - {t("editTransaction.previousFeesInfo.maxFee", { - amount: maxFeePerGasinGwei, - })} - - - ) : ( - - {t("editTransaction.previousFeesInfo.gasPrice", { - amount: maxGasPriceinGwei, - })} - - )} - - ); - } - - return feeValue.toNumber() > 0 ? ( - - - {t("editTransaction.previousFeesInfo.networkfee", { - amount: feeValue.toNumber(), - unit: mainAccount.currency.ticker, - })} - - - ) : null; - } - - return null; -}; - -export const CurrentNetworkFee = memo(CurrentNetworkFeeComponent); diff --git a/apps/ledger-live-mobile/src/families/ethereum/EditFeeUnitEthereum.tsx b/apps/ledger-live-mobile/src/families/ethereum/EditFeeUnitEthereum.tsx deleted file mode 100644 index 8dfe84fb6605..000000000000 --- a/apps/ledger-live-mobile/src/families/ethereum/EditFeeUnitEthereum.tsx +++ /dev/null @@ -1,141 +0,0 @@ -import React, { useCallback } from "react"; -import Slider from "react-native-slider"; -import { BigNumber } from "bignumber.js"; -import { useTranslation } from "react-i18next"; -import { View, StyleSheet } from "react-native"; -import { useTheme } from "@react-navigation/native"; -import type { Account, AccountLike } from "@ledgerhq/types-live"; -import { getMainAccount } from "@ledgerhq/live-common/account/index"; -import type { Transaction } from "@ledgerhq/live-common/families/ethereum/types"; -import { getDefaultFeeUnit } from "@ledgerhq/live-common/families/ethereum/logic"; -import { reverseRangeIndex, projectRangeIndex, Range } from "@ledgerhq/live-common/range"; -import LText from "../../components/LText"; -import CurrencyUnitValue from "../../components/CurrencyUnitValue"; - -const FeeSlider = React.memo( - ({ - value, - onChange, - range, - }: { - value: BigNumber; - onChange: (arg: unknown) => void; - range: Range; - }) => { - const { colors } = useTheme(); - const index = reverseRangeIndex(range, value); - const setValueIndex = useCallback( - i => onChange(projectRangeIndex(range, i)), - [range, onChange], - ); - return ( - - ); - }, -); - -type Props = { - account: AccountLike; - parentAccount: Account | null | undefined; - transaction: Transaction; - feeAmount: BigNumber; - onChange: (value: BigNumber) => void; - range: Range; - title: string; -}; -export default function EditFeeUnitEthereum({ - account, - parentAccount, - transaction, - feeAmount, - onChange, - range, - title, -}: Props) { - const { colors } = useTheme(); - const { t } = useTranslation(); - const mainAccount = getMainAccount(account, parentAccount); - const unit = getDefaultFeeUnit(mainAccount.currency); - - const feeCustomUnit = transaction.feeCustomUnit; - - const onChangeF = useCallback( - value => { - onChange(value); - }, - [onChange], - ); - - return ( - - - - - {t(title)} - - - - - - - - - - - - {t("fees.speed.slow")} - - - {t("fees.speed.fast")} - - - - - - ); -} - -const styles = StyleSheet.create({ - sliderContainer: { - paddingLeft: 0, - }, - feeHeader: { - flexDirection: "row", - justifyContent: "space-between", - alignItems: "center", - }, - feeLabel: { - fontSize: 20, - }, - feeAmount: { - paddingVertical: 4, - paddingHorizontal: 8, - }, - container: { - flexDirection: "column", - justifyContent: "center", - }, - textContainer: { - flexDirection: "row", - justifyContent: "space-between", - }, - currencyUnitText: { - fontSize: 14, - textTransform: "capitalize", - }, -}); diff --git a/apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditEthereumSummary.tsx b/apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditEthereumSummary.tsx deleted file mode 100644 index d25c19f226c5..000000000000 --- a/apps/ledger-live-mobile/src/families/ethereum/EditTransactionFlow/EditEthereumSummary.tsx +++ /dev/null @@ -1,362 +0,0 @@ -import useBridgeTransaction from "@ledgerhq/live-common/bridge/useBridgeTransaction"; -import React, { useState, useCallback, Component, useEffect } from "react"; -import { View, StyleSheet } from "react-native"; -import { SafeAreaView } from "react-native-safe-area-context"; -import { useSelector } from "react-redux"; -import { Trans } from "react-i18next"; -import { getMainAccount, getAccountCurrency } from "@ledgerhq/live-common/account/index"; -import type { Account } from "@ledgerhq/types-live"; -import { isNftTransaction } from "@ledgerhq/live-common/nft/index"; -import { isEditableOperation } from "@ledgerhq/coin-framework/operation"; -import { NotEnoughGas, TransactionHasBeenValidatedError } from "@ledgerhq/errors"; -import { useNavigation, useTheme } from "@react-navigation/native"; -import invariant from "invariant"; -import { apiForCurrency } from "@ledgerhq/live-common/families/ethereum/api/index"; -import { isCurrencySupported } from "@ledgerhq/coin-framework/currencies/index"; - -import { NavigatorName, ScreenName } from "../../../const"; -import { accountScreenSelector } from "../../../reducers/accounts"; -import { TrackScreen } from "../../../analytics"; -import NavigationScrollView from "../../../components/NavigationScrollView"; -import Alert from "../../../components/Alert"; -import SummaryFromSection from "../../../screens/SendFunds/SummaryFromSection"; -import SummaryToSection from "../../../screens/SendFunds/SummaryToSection"; -import LText from "../../../components/LText"; -import SectionSeparator from "../../../components/SectionSeparator"; -import SummaryNft from "../../../screens/SendFunds/SummaryNft"; -import SummaryAmountSection from "../../../screens/SendFunds/SummaryAmountSection"; -import TranslatedError from "../../../components/TranslatedError"; -import SendRowsFee from "../../../components/SendRowsFee"; -import SendRowsCustom from "../../../components/SendRowsCustom"; -import Info from "../../../icons/Info"; -import SummaryTotalSection from "../../../screens/SendFunds/SummaryTotalSection"; -import Button from "../../../components/Button"; -import ConfirmationModal from "../../../components/ConfirmationModal"; -import AlertTriangle from "../../../icons/AlertTriangle"; -import TooMuchUTXOBottomModal from "../../../screens/SendFunds/TooMuchUTXOBottomModal"; -import { CurrentNetworkFee } from "../CurrentNetworkFee"; -import { useTransactionChangeFromNavigation } from "../../../logic/screenTransactionHooks"; -import { CryptoCurrency } from "@ledgerhq/types-cryptoassets"; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -function EditEthereumSummary({ navigation, route }: any) { - const { colors } = useTheme(); - const { nextNavigation, overrideAmountLabel, hideTotal, operation } = route.params; - - const { account, parentAccount } = useSelector(accountScreenSelector(route)); - - invariant(account, "account is missing"); - - const { transaction, setTransaction, status, bridgePending } = useBridgeTransaction(() => ({ - transaction: route.params.transaction, - account, - parentAccount, - })); - - invariant(transaction, "transaction is missing"); - - const isNFTSend = isNftTransaction(transaction); - // handle any edit screen changes like fees changes - useTransactionChangeFromNavigation(setTransaction); - const [continuing, setContinuing] = useState(false); - const [highFeesOpen, setHighFeesOpen] = useState(false); - const [highFeesWarningPassed, setHighFeesWarningPassed] = useState(false); - const [utxoWarningOpen, setUtxoWarningOpen] = useState(false); - const [utxoWarningPassed, setUtxoWarningPassed] = useState(false); - const navigateToNext = useCallback(() => { - if (!nextNavigation) return null; - return ( - // This component is used in a wild bunch of navigators. - // nextNavigation is a param which can have too many shapes - // Unfortunately for this reason let's keep it untyped for now. - navigation.navigate(nextNavigation, { - ...route.params, - transaction, - status, - selectDeviceLink: true, - }) - ); - }, [navigation, nextNavigation, route.params, transaction, status]); - useEffect(() => { - if (!continuing) { - return; - } - const { warnings } = status; - - if (Object.keys(warnings).includes("feeTooHigh") && !highFeesWarningPassed) { - setHighFeesOpen(true); - return; - } - - setContinuing(false); - setUtxoWarningPassed(false); - setHighFeesWarningPassed(false); - navigateToNext(); - }, [status, continuing, highFeesWarningPassed, account, utxoWarningPassed, navigateToNext]); - const onPassUtxoWarning = useCallback(() => { - setUtxoWarningOpen(false); - setUtxoWarningPassed(true); - }, []); - const onRejectUtxoWarning = useCallback(() => { - setUtxoWarningOpen(false); - setContinuing(false); - }, []); - const onAcceptFees = useCallback(() => { - setHighFeesOpen(false); - setHighFeesWarningPassed(true); - }, []); - const onRejectFees = useCallback(() => { - setHighFeesOpen(false); - setContinuing(false); - }, [setHighFeesOpen]); - const { amount, totalSpent, errors } = status; - const { transaction: transactionError } = errors; - const error = errors[Object.keys(errors)[0]]; - const mainAccount = getMainAccount(account, parentAccount); - const currencyOrToken = getAccountCurrency(account); - const hasNonEmptySubAccounts = - account && - account.type === "Account" && - (account.subAccounts || []).some(subAccount => subAccount.balance.gt(0)); - - const onBuyEth = useCallback(() => { - navigation.navigate(NavigatorName.Exchange, { - screen: ScreenName.ExchangeBuy, - params: { - defaultAccountId: account?.id, - defaultCurrencyId: currencyOrToken?.id, - }, - }); - }, [navigation, account?.id, currencyOrToken?.id]); - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const errorNavigation = useNavigation(); - const editableOperation = operation && isEditableOperation(account, operation); - - if (editableOperation) { - apiForCurrency(mainAccount.currency) - .getTransactionByHash(operation?.hash || "") - .then(tx => { - if (tx?.confirmations) { - errorNavigation.navigate(ScreenName.TransactionAlreadyValidatedError, { - error: new TransactionHasBeenValidatedError( - "The transaction has already been validated. You can't cancel or speedup a validated transaction.", - ), - }); - } - }); - } - - // FIXME: why is recipient sometimes empty? - if (!account || !transaction || !transaction.recipient || !currencyOrToken) { - return null; - } - - return ( - - - - {transaction.useAllAmount && hasNonEmptySubAccounts ? ( - - - - - - ) : null} - - - - {status.warnings.recipient ? ( - - - - ) : null} - - - {isNFTSend ? ( - - ) : ( - - )} - - - {editableOperation ? ( - - ) : null} - - {error ? ( - - - - - - - - - ) : null} - {!amount.eq(totalSpent) && !hideTotal ? ( - <> - - - - ) : null} - - - - - - {error && error instanceof NotEnoughGas ? ( - isCurrencySupported(currencyOrToken as CryptoCurrency) && ( - - - - ); -} diff --git a/apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/types.ts b/apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/types.ts deleted file mode 100644 index b595f0d5aaef..000000000000 --- a/apps/ledger-live-mobile/src/families/ethereum/EthereumStakingDrawer/types.ts +++ /dev/null @@ -1,12 +0,0 @@ -export type EthStakingProviders = { - listProvider: Array<{ - id: string; - name: string; - liveAppId: string; - supportLink?: string; - icon?: string; - queryParams?: Record; - }>; -}; - -export type ListProvider = EthStakingProviders["listProvider"][number]; diff --git a/apps/ledger-live-mobile/src/families/ethereum/ScreenEditGasLimit.tsx b/apps/ledger-live-mobile/src/families/ethereum/ScreenEditGasLimit.tsx deleted file mode 100644 index 3332688155b1..000000000000 --- a/apps/ledger-live-mobile/src/families/ethereum/ScreenEditGasLimit.tsx +++ /dev/null @@ -1,113 +0,0 @@ -import { BigNumber } from "bignumber.js"; -import React, { useState, useCallback } from "react"; -import { useTranslation, Trans } from "react-i18next"; -import { Keyboard, StyleSheet, View } from "react-native"; -import { SafeAreaView } from "react-native-safe-area-context"; -import { useTheme } from "@react-navigation/native"; -import Button from "../../components/Button"; -import KeyboardView from "../../components/KeyboardView"; -import NavigationScrollView from "../../components/NavigationScrollView"; -import TextInput from "../../components/FocusedTextInput"; -import { BaseComposite, StackNavigatorProps } from "../../components/RootNavigator/types/helpers"; -import { SendFundsNavigatorStackParamList } from "../../components/RootNavigator/types/SendFundsNavigator"; -import { SignTransactionNavigatorParamList } from "../../components/RootNavigator/types/SignTransactionNavigator"; -import { SwapNavigatorParamList } from "../../components/RootNavigator/types/SwapNavigator"; -import { ScreenName } from "../../const"; - -const options = { - title: , - headerLeft: undefined, -}; - -type NavigationProps = BaseComposite< - StackNavigatorProps< - SendFundsNavigatorStackParamList | SignTransactionNavigatorParamList | SwapNavigatorParamList, - ScreenName.EthereumEditGasLimit - > ->; - -function EthereumEditGasLimit({ navigation, route }: NavigationProps) { - const { colors } = useTheme(); - const { t } = useTranslation(); - const gasLimit = route.params?.gasLimit; - const setGasLimit = route.params?.setGasLimit; - const [ownGasLimit, setOwnGasLimit] = useState(gasLimit); - const onValidateText = useCallback(() => { - Keyboard.dismiss(); - navigation.goBack(); - setGasLimit(BigNumber(ownGasLimit || 0)); - }, [setGasLimit, ownGasLimit, navigation]); - - const onChangeText = useCallback((v: string) => { - const n = BigNumber(v); - setOwnGasLimit(n); - }, []); - return ( - - - - - - -