diff --git a/.changeset/tricky-dryers-check.md b/.changeset/tricky-dryers-check.md
new file mode 100644
index 000000000000..e0bc0c71ba1f
--- /dev/null
+++ b/.changeset/tricky-dryers-check.md
@@ -0,0 +1,7 @@
+---
+"@ledgerhq/types-live": minor
+"ledger-live-desktop": minor
+"@ledgerhq/live-common": minor
+---
+
+remove legacy swap code on LLD
diff --git a/apps/ledger-live-desktop/src/renderer/analytics/segment.ts b/apps/ledger-live-desktop/src/renderer/analytics/segment.ts
index 079074319398..a6acf0eb6ed2 100644
--- a/apps/ledger-live-desktop/src/renderer/analytics/segment.ts
+++ b/apps/ledger-live-desktop/src/renderer/analytics/segment.ts
@@ -99,16 +99,6 @@ const getPtxAttributes = () => {
const fetchAdditionalCoins = analyticsFeatureFlagMethod("fetchAdditionalCoins");
const stakingProviders = analyticsFeatureFlagMethod("ethStakingProviders");
const ptxCard = analyticsFeatureFlagMethod("ptxCard");
- const ptxSwapMoonpayProviderFlag = analyticsFeatureFlagMethod("ptxSwapMoonpayProvider");
-
- const ptxSwapLiveAppDemoZero = analyticsFeatureFlagMethod("ptxSwapLiveAppDemoZero")?.enabled;
- const ptxSwapLiveAppDemoOne = analyticsFeatureFlagMethod("ptxSwapLiveAppDemoOne")?.enabled;
- const ptxSwapLiveAppDemoThree = analyticsFeatureFlagMethod("ptxSwapLiveAppDemoThree")?.enabled;
- const ptxSwapExodusProvider = analyticsFeatureFlagMethod("ptxSwapExodusProvider")?.enabled;
- const ptxSwapCoreExperimentFlag = analyticsFeatureFlagMethod("ptxSwapCoreExperiment");
- const ptxSwapCoreExperiment = ptxSwapCoreExperimentFlag?.enabled
- ? ptxSwapCoreExperimentFlag?.params?.variant
- : undefined;
const isBatch1Enabled: boolean =
!!fetchAdditionalCoins?.enabled && fetchAdditionalCoins?.params?.batch === 1;
@@ -122,19 +112,13 @@ const getPtxAttributes = () => {
stakingProviders?.params?.listProvider?.length > 0
? stakingProviders?.params?.listProvider.length
: "flag not loaded";
- const ptxSwapMoonpayProviderEnabled: boolean = !!ptxSwapMoonpayProviderFlag?.enabled;
+
return {
isBatch1Enabled,
isBatch2Enabled,
isBatch3Enabled,
stakingProvidersEnabled,
ptxCard,
- ptxSwapMoonpayProviderEnabled,
- ptxSwapLiveAppDemoZero,
- ptxSwapLiveAppDemoOne,
- ptxSwapLiveAppDemoThree,
- ptxSwapCoreExperiment,
- ptxSwapExodusProvider,
};
};
diff --git a/apps/ledger-live-desktop/src/renderer/components/AnimatedCountdown.tsx b/apps/ledger-live-desktop/src/renderer/components/AnimatedCountdown.tsx
deleted file mode 100644
index 05e5714226a2..000000000000
--- a/apps/ledger-live-desktop/src/renderer/components/AnimatedCountdown.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, { memo } from "react";
-import styled from "styled-components";
-
-const WrappedSvg = styled.svg`
- transform: rotate(-90deg);
- border-radius: 50%;
- background-clip: padding-box;
-`;
-
-type Props = {
- size: number;
- bgColor?: string;
- fillColor?: string;
- duration?: number;
-};
-const AnimatedCountdown = ({
- size = 10,
- bgColor = "#8A9199",
- fillColor = "white",
- duration = 60000,
-}: Props) => {
- return (
-
-
-
-
-
-
- );
-};
-export default memo(AnimatedCountdown);
diff --git a/apps/ledger-live-desktop/src/renderer/hooks/swap-migrations/useSwapLiveAppHook.tsx b/apps/ledger-live-desktop/src/renderer/hooks/swap-migrations/useSwapLiveAppHook.tsx
deleted file mode 100644
index 7fcc3a521cfe..000000000000
--- a/apps/ledger-live-desktop/src/renderer/hooks/swap-migrations/useSwapLiveAppHook.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { getFeesCurrency, getMainAccount } from "@ledgerhq/live-common/account/index";
-import { formatCurrencyUnit } from "@ledgerhq/live-common/currencies/index";
-import { SwapTransactionType } from "@ledgerhq/live-common/exchange/swap/types";
-import { getProviderName } from "@ledgerhq/live-common/exchange/swap/utils/index";
-import { accountToWalletAPIAccount } from "@ledgerhq/live-common/wallet-api/converters";
-import { getEnv } from "@ledgerhq/live-env";
-import BigNumber from "bignumber.js";
-import isEqual from "lodash/isEqual";
-import { useEffect, useMemo, useRef } from "react";
-import { useSelector } from "react-redux";
-import { rateSelector } from "~/renderer/actions/swap";
-import { walletSelector } from "~/renderer/reducers/wallet";
-import {
- SwapProps,
- SwapWebManifestIDs,
- SwapWebProps,
-} from "~/renderer/screens/exchange/Swap2/Form/SwapWebView";
-import { useMaybeAccountUnit } from "../useAccountUnit";
-
-export type UseSwapLiveAppHookProps = {
- manifestID?: string;
- isSwapLiveAppEnabled: boolean;
- swapTransaction: SwapTransactionType;
- swapError?: Error;
- updateSwapWebProps: React.Dispatch | undefined>>;
- getExchangeSDKParams: () => Partial;
- getProviderRedirectURLSearch: () => URLSearchParams;
-};
-
-const SWAP_API_BASE = getEnv("SWAP_API_BASE");
-
-export const useSwapLiveAppHook = (props: UseSwapLiveAppHookProps) => {
- const {
- isSwapLiveAppEnabled,
- manifestID,
- swapTransaction,
- swapError,
- updateSwapWebProps,
- getExchangeSDKParams,
- getProviderRedirectURLSearch,
- } = props;
- const exchangeRate = useSelector(rateSelector);
- const provider = exchangeRate?.provider;
- const exchangeRatesState = swapTransaction.swap?.rates;
- const swapWebPropsRef = useRef(undefined);
- const mainFromAccount =
- swapTransaction.swap.from.account &&
- getMainAccount(swapTransaction.swap.from.account, swapTransaction.swap.from.parentAccount);
- const estimatedFeesUnit = mainFromAccount && getFeesCurrency(mainFromAccount);
-
- const unit = useMaybeAccountUnit(mainFromAccount);
- const estimatedFees = useMemo(() => {
- return unit && BigNumber(formatCurrencyUnit(unit, swapTransaction.status.estimatedFees));
- }, [swapTransaction.status.estimatedFees, unit]);
-
- const walletState = useSelector(walletSelector);
-
- useEffect(() => {
- if (isSwapLiveAppEnabled) {
- const providerRedirectURLSearch = getProviderRedirectURLSearch();
- const { parentAccount: fromParentAccount } = swapTransaction.swap.from;
- const fromParentAccountId = fromParentAccount
- ? accountToWalletAPIAccount(walletState, fromParentAccount)?.id
- : undefined;
- const providerRedirectURL = `ledgerlive://discover/${getProviderName(
- provider ?? "",
- ).toLowerCase()}?${providerRedirectURLSearch.toString()}`;
-
- let loading = swapTransaction.bridgePending;
-
- if (manifestID === SwapWebManifestIDs.Demo0) {
- loading = swapTransaction.bridgePending || exchangeRatesState.status === "loading";
- }
-
- const newSwapWebProps = {
- provider,
- ...getExchangeSDKParams(),
- fromParentAccountId,
- error: !!swapError,
- loading,
- providerRedirectURL,
- swapApiBase: SWAP_API_BASE,
- estimatedFees: estimatedFees?.toString(),
- estimatedFeesUnit: estimatedFeesUnit?.id,
- };
-
- if (!isEqual(newSwapWebProps, swapWebPropsRef.current)) {
- swapWebPropsRef.current = newSwapWebProps;
- updateSwapWebProps(newSwapWebProps);
- }
- }
- }, [
- walletState,
- provider,
- manifestID,
- isSwapLiveAppEnabled,
- getExchangeSDKParams,
- getProviderRedirectURLSearch,
- swapTransaction.swap.from,
- swapTransaction.swap.from.amount,
- swapError,
- swapTransaction.bridgePending,
- exchangeRatesState.status,
- updateSwapWebProps,
- estimatedFees,
- estimatedFeesUnit?.id,
- ]);
-};
diff --git a/apps/ledger-live-desktop/src/renderer/icons/ArrowsUpDown.tsx b/apps/ledger-live-desktop/src/renderer/icons/ArrowsUpDown.tsx
deleted file mode 100644
index 5a1959946298..000000000000
--- a/apps/ledger-live-desktop/src/renderer/icons/ArrowsUpDown.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from "react";
-const ArrowsUpDown = ({ size = 16, color = "currentColor" }: { size: number; color?: string }) => (
-
-);
-export default ArrowsUpDown;
diff --git a/apps/ledger-live-desktop/src/renderer/modals/Platform/Exchange/CompleteExchange/Body.tsx b/apps/ledger-live-desktop/src/renderer/modals/Platform/Exchange/CompleteExchange/Body.tsx
index d57f19560a1c..89c6b60487ff 100644
--- a/apps/ledger-live-desktop/src/renderer/modals/Platform/Exchange/CompleteExchange/Body.tsx
+++ b/apps/ledger-live-desktop/src/renderer/modals/Platform/Exchange/CompleteExchange/Body.tsx
@@ -13,10 +13,17 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"
import { useDispatch } from "react-redux";
import styled from "styled-components";
import { updateAccountWithUpdater } from "~/renderer/actions/accounts";
-import { useIsSwapLiveFlagEnabled } from "~/renderer/screens/exchange/Swap2/hooks/useIsSwapLiveFlagEnabled";
+
import { useRedirectToSwapHistory } from "~/renderer/screens/exchange/Swap2/utils";
import { BodyContent } from "./BodyContent";
+export enum ExchangeModeEnum {
+ Sell = "sell",
+ Swap = "swap",
+}
+
+export type ExchangeMode = "sell" | "swap";
+
export type Data = {
provider: string;
exchange: Exchange;
@@ -32,13 +39,6 @@ export type Data = {
magnitudeAwareRate?: BigNumber;
};
-export enum ExchangeModeEnum {
- Sell = "sell",
- Swap = "swap",
-}
-
-export type ExchangeMode = "sell" | "swap";
-
type ResultsState = {
mode: ExchangeMode;
swapId?: string;
@@ -195,7 +195,6 @@ const Body = ({ data, onClose }: { data: Data; onClose?: () => void | undefined
const handleSellTransaction = (operation: Operation, result: ResultsState) => {
handleTransactionResult(result, operation);
};
- const isDemo3Enabled = useIsSwapLiveFlagEnabled("ptxSwapLiveAppDemoThree");
const onBroadcastSuccess = useCallback(
(operation: Operation) => {
@@ -209,7 +208,7 @@ const Body = ({ data, onClose }: { data: Data; onClose?: () => void | undefined
const result = getResultByTransactionType(isSwapTransaction);
if (getEnv("DISABLE_TRANSACTION_BROADCAST")) {
- if (!isSwapTransaction || (isSwapTransaction && !isDemo3Enabled)) {
+ if (!isSwapTransaction) {
const error = new DisabledTransactionBroadcastError();
setError(error);
onCancel(error);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/App/App.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/App/App.tsx
index ecbb5d8de74b..348c47bf1f8d 100644
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/App/App.tsx
+++ b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/App/App.tsx
@@ -1,4 +1,5 @@
import { useSwapLiveConfig } from "@ledgerhq/live-common/exchange/swap/hooks/index";
+import { DEFAULT_FEATURES } from "@ledgerhq/live-common/featureFlags/index";
import { useRemoteLiveAppManifest } from "@ledgerhq/live-common/platform/providers/RemoteLiveAppProvider/index";
import { useLocalLiveAppManifest } from "@ledgerhq/live-common/wallet-api/LocalLiveAppProvider/index";
import React, { useState } from "react";
@@ -26,10 +27,16 @@ const ErrorWrapper = styled.div`
font-weight: 500;
`;
+// set the default manifest ID for the production swap live app
+// in case the FF is failing to load the manifest ID
+// "swap-live-app-demo-3" points to production vercel URL for the swap live app
+const DEFAULT_MANIFEST_ID =
+ process.env.DEFAULT_SWAP_MANIFEST_ID || DEFAULT_FEATURES.ptxSwapLiveApp.params?.manifest_id;
+
export function SwapApp() {
const [unavailable, setUnavailable] = useState(false);
const swapLiveEnabledFlag = useSwapLiveConfig();
- const swapLiveAppManifestID = swapLiveEnabledFlag?.params?.manifest_id;
+ const swapLiveAppManifestID = swapLiveEnabledFlag?.params?.manifest_id || DEFAULT_MANIFEST_ID;
const localManifest = useLocalLiveAppManifest(swapLiveAppManifestID || undefined);
const remoteManifest = useRemoteLiveAppManifest(swapLiveAppManifestID || undefined);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/DrawerTitle.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/DrawerTitle.tsx
deleted file mode 100644
index 123bbd9e45a9..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/DrawerTitle.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from "react";
-import { Trans } from "react-i18next";
-import Box from "~/renderer/components/Box/Box";
-import { Separator } from "./Separator";
-import Text from "~/renderer/components/Text";
-
-export function DrawerTitle({ i18nKey }: { i18nKey: string }) {
- return (
- <>
-
-
-
-
-
-
-
- );
-}
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/ExchangeDrawer/SwapAction.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/ExchangeDrawer/SwapAction.tsx
deleted file mode 100644
index a260b8a66c53..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/ExchangeDrawer/SwapAction.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { getEnv } from "@ledgerhq/live-env";
-import {
- ExchangeSwap,
- ExchangeRate,
- InitSwapResult,
- SwapTransaction,
- SwapTransactionType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import { useBroadcast } from "@ledgerhq/live-common/hooks/useBroadcast";
-import { createAction as initSwapCreateAction } from "@ledgerhq/live-common/hw/actions/initSwap";
-import { createAction as transactionCreateAction } from "@ledgerhq/live-common/hw/actions/transaction";
-import { Operation, SignedOperation } from "@ledgerhq/types-live";
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { Trans } from "react-i18next";
-import { useSelector } from "react-redux";
-import BigSpinner from "~/renderer/components/BigSpinner";
-import Box from "~/renderer/components/Box";
-import { mockedEventEmitter } from "~/renderer/components/debug/DebugMock";
-import DeviceAction from "~/renderer/components/DeviceAction";
-import Text from "~/renderer/components/Text";
-import { getCurrentDevice } from "~/renderer/reducers/devices";
-import { mevProtectionSelector } from "~/renderer/reducers/settings";
-import connectApp from "@ledgerhq/live-common/hw/connectApp";
-import initSwap from "@ledgerhq/live-common/exchange/swap/initSwap";
-import { Device } from "@ledgerhq/types-devices";
-import { BigNumber } from "bignumber.js";
-
-const transactionAction = transactionCreateAction(getEnv("MOCK") ? mockedEventEmitter : connectApp);
-const initAction = initSwapCreateAction(
- getEnv("MOCK") ? mockedEventEmitter : connectApp,
- getEnv("MOCK") ? mockedEventEmitter : initSwap,
-);
-
-const TransactionResult = (
- props:
- | { signedOperation: SignedOperation; device?: Device; swapId?: string | undefined }
- | { transactionSignError?: Error },
-) => {
- if (!("signedOperation" in props) || !props.signedOperation) return null;
- return (
-
-
-
-
-
-
- );
-};
-
-type Props = {
- swapTransaction: SwapTransactionType;
- exchangeRate: ExchangeRate;
- onCompletion: (a: {
- operation: Operation;
- swapId: string;
- magnitudeAwareRate: BigNumber;
- }) => void;
- onError: (a: { error: Error; swapId?: string }) => void;
-};
-
-export default function SwapAction({
- swapTransaction,
- exchangeRate,
- onCompletion,
- onError,
-}: Props) {
- const [initData, setInitData] = useState(null);
- const [signedOperation, setSignedOperation] = useState(null);
- const mevProtected = useSelector(mevProtectionSelector);
- const device = useSelector(getCurrentDevice);
- const deviceRef = useRef(device);
- const { account: fromAccount, parentAccount: fromParentAccount } = swapTransaction.swap.from;
- const { account: toAccount, parentAccount: toParentAccount } = swapTransaction.swap.to;
- const { transaction, status } = swapTransaction;
- const tokenCurrency =
- fromAccount && fromAccount.type === "TokenAccount" ? fromAccount.token : null;
-
- const broadcast = useBroadcast({
- account: fromAccount,
- parentAccount: fromParentAccount,
- broadcastConfig: { mevProtected },
- });
-
- const exchange = useMemo(
- () => ({
- fromParentAccount,
- fromAccount,
- toParentAccount,
- toAccount,
- }),
- [fromAccount, fromParentAccount, toAccount, toParentAccount],
- );
-
- useEffect(() => {
- if (initData && signedOperation) {
- const { swapId, magnitudeAwareRate } = initData;
- broadcast(signedOperation).then(
- operation => {
- onCompletion({
- operation,
- swapId,
- magnitudeAwareRate,
- });
- },
- error => {
- onError({
- error,
- swapId,
- });
- },
- );
- }
- }, [broadcast, onCompletion, onError, initData, signedOperation]);
-
- const request = useMemo(
- () => ({
- exchange: exchange as ExchangeSwap,
- exchangeRate,
- transaction: transaction as SwapTransaction,
- status,
- device: deviceRef,
- }),
- [exchange, exchangeRate, status, transaction],
- );
-
- const signRequest = useMemo(
- () => ({
- tokenCurrency,
- parentAccount: fromParentAccount,
- account: fromAccount!,
- transaction: initData?.transaction,
- appName: "Exchange",
- }),
- [fromAccount, fromParentAccount, initData?.transaction, tokenCurrency],
- );
-
- return !initData || !transaction ? (
- {
- if ("initSwapError" in result && result.initSwapError) {
- onError({
- error: result.initSwapError,
- swapId: result.swapId,
- });
- } else if ("initSwapResult" in result) {
- setInitData(result.initSwapResult);
- }
- }}
- analyticsPropertyFlow="swap"
- />
- ) : !signedOperation ? (
- {
- if ("transactionSignError" in result) {
- onError({
- error: result.transactionSignError,
- swapId: initData.swapId,
- });
- } else {
- setSignedOperation(result.signedOperation);
- }
- }}
- analyticsPropertyFlow="swap"
- />
- ) : (
-
- );
-}
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/ExchangeDrawer/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/ExchangeDrawer/index.tsx
deleted file mode 100644
index 1a1318267193..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/ExchangeDrawer/index.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-import { postSwapCancelled } from "@ledgerhq/live-common/exchange/swap/index";
-import { setBroadcastTransaction } from "@ledgerhq/live-common/exchange/swap/setBroadcastTransaction";
-import { getUpdateAccountWithUpdaterParams } from "@ledgerhq/live-common/exchange/swap/getUpdateAccountWithUpdaterParams";
-import { CompleteExchangeError } from "@ledgerhq/live-common/exchange/error";
-import {
- ExchangeSwap,
- SwapTransactionType,
- ExchangeRate,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import React, { useCallback, useMemo, useState } from "react";
-import { Trans } from "react-i18next";
-import { useDispatch, useSelector } from "react-redux";
-import styled from "styled-components";
-import TrackPage from "~/renderer/analytics/TrackPage";
-import { track } from "~/renderer/analytics/segment";
-import { updateAccountWithUpdater } from "~/renderer/actions/accounts";
-import Box from "~/renderer/components/Box";
-import Button from "~/renderer/components/Button";
-import {
- Footer as DeviceActionFooter,
- Header as DeviceActionHeader,
-} from "~/renderer/components/DeviceAction/rendering";
-import ErrorDisplay from "~/renderer/components/ErrorDisplay";
-import { setDrawer } from "~/renderer/drawers/Provider";
-import { useGetSwapTrackingProperties, useRedirectToSwapHistory } from "../../utils/index";
-import { DrawerTitle } from "../DrawerTitle";
-import { Separator } from "../Separator";
-import SwapAction from "./SwapAction";
-import SwapCompleted from "./SwapCompleted";
-import { Operation } from "@ledgerhq/types-live";
-import { BigNumber } from "bignumber.js";
-import { getCurrentDevice } from "~/renderer/reducers/devices";
-import { rateSelector } from "~/renderer/actions/swap";
-
-const ContentBox = styled(Box)`
- ${DeviceActionHeader} {
- flex: 0;
- }
- ${DeviceActionFooter} {
- flex: 0;
- }
-`;
-
-type Props = {
- swapTransaction: SwapTransactionType;
- exchangeRate: ExchangeRate;
- onCompleteSwap?: () => void;
-};
-
-export default function ExchangeDrawer({ swapTransaction, exchangeRate, onCompleteSwap }: Props) {
- const dispatch = useDispatch();
- const [error, setError] = useState(null);
- const [result, setResult] = useState<{
- operation: Operation;
- swapId: string;
- } | null>(null);
- const swapDefaultTrack = useGetSwapTrackingProperties();
- const device = useSelector(getCurrentDevice);
- const selectedExchangeRate = useSelector(rateSelector);
- const redirectToHistory = useRedirectToSwapHistory();
- const {
- transaction,
- swap: {
- from: { account: fromAccount, parentAccount: fromParentAccount, currency: sourceCurrency },
- to: { account: toAccount, parentAccount: toParentAccount, currency: targetCurrency },
- },
- } = swapTransaction;
-
- const exchange = useMemo(
- () => ({
- fromParentAccount,
- fromAccount,
- toParentAccount,
- toAccount,
- }),
- [fromAccount, fromParentAccount, toAccount, toParentAccount],
- ) as ExchangeSwap;
-
- const onError = useCallback(
- (errorResult: { error: Error; swapId?: string }) => {
- const { error, swapId } = errorResult;
- // Consider the swap as cancelled (on provider perspective) in case of error
- postSwapCancelled({
- provider: exchangeRate.provider,
- swapId: swapId ?? "",
- ...((error as CompleteExchangeError).step
- ? { swapStep: (error as CompleteExchangeError).step }
- : {}),
- statusCode: error.name,
- errorMessage: error.message,
- sourceCurrencyId: swapTransaction.swap.from.currency?.id,
- targetCurrencyId: swapTransaction.swap.to.currency?.id,
- hardwareWalletType: device?.modelId,
- swapType: selectedExchangeRate?.tradeMethod,
- });
- track("error_message", {
- message: "drawer_error",
- page: "Page Swap Drawer",
- ...swapDefaultTrack,
- error,
- });
- setError(error);
- },
- // eslint-disable-next-line react-hooks/exhaustive-deps
- [exchangeRate.provider, swapDefaultTrack],
- );
-
- const onCompletion = useCallback(
- ({
- magnitudeAwareRate,
- ...result
- }: {
- operation: Operation;
- swapId: string;
- magnitudeAwareRate: BigNumber;
- }) => {
- const { provider } = exchangeRate;
-
- setBroadcastTransaction({
- result,
- provider,
- sourceCurrencyId: swapTransaction.swap.from.currency?.id,
- targetCurrencyId: swapTransaction.swap.to.currency?.id,
- hardwareWalletType: device?.modelId,
- swapType: selectedExchangeRate?.tradeMethod,
- });
- const params = getUpdateAccountWithUpdaterParams({
- result,
- exchange,
- transaction,
- magnitudeAwareRate,
- provider,
- });
- if (!params.length) return;
- const dispatchAction = updateAccountWithUpdater(...params);
- dispatch(dispatchAction);
- setResult(result);
- onCompleteSwap && onCompleteSwap();
- },
- // eslint-disable-next-line react-hooks/exhaustive-deps
- [dispatch, exchange, exchangeRate, transaction, onCompleteSwap],
- );
-
- const onViewDetails = useCallback(
- () => {
- if (!result) return;
- const { operation } = result;
- const concernedOperation = operation
- ? operation.subOperations && operation.subOperations.length > 0
- ? operation.subOperations[0]
- : operation
- : null;
- if (fromAccount && concernedOperation) {
- redirectToHistory({
- swapId: result?.swapId,
- });
- }
- },
- // eslint-disable-next-line react-hooks/exhaustive-deps
- [fromAccount, fromParentAccount, result?.operation],
- );
-
- const closeDrawer = useCallback(() => setDrawer(), []);
-
- if (error) {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
- if (result) {
- return (
-
-
- {targetCurrency && (
-
-
-
- )}
-
-
-
-
-
-
-
- );
- }
- return (
-
-
-
-
-
-
- );
-}
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FeesDrawer/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FeesDrawer/index.tsx
deleted file mode 100644
index d8e26517429c..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FeesDrawer/index.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { useCallback } from "react";
-import { useSelector } from "react-redux";
-import Box from "~/renderer/components/Box";
-import SendAmountFields from "~/renderer/modals/Send/SendAmountFields";
-import { transactionSelector } from "~/renderer/actions/swap";
-import {
- SwapTransactionType,
- SwapSelectorStateType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import { DrawerTitle } from "../DrawerTitle";
-import TrackPage from "~/renderer/analytics/TrackPage";
-import { useGetSwapTrackingProperties } from "../../utils/index";
-import { Account, FeeStrategy } from "@ledgerhq/types-live";
-
-type Props = {
- setTransaction: SwapTransactionType["setTransaction"];
- updateTransaction: SwapTransactionType["updateTransaction"];
- mainAccount: SwapSelectorStateType["account"];
- parentAccount: SwapSelectorStateType["parentAccount"];
- currency: SwapSelectorStateType["currency"];
- status: SwapTransactionType["status"];
- disableSlowStrategy?: boolean;
- provider: string | undefined | null;
-};
-
-export default function FeesDrawer({
- setTransaction,
- updateTransaction,
- mainAccount,
- parentAccount,
- status,
- provider,
- disableSlowStrategy = false,
-}: Props) {
- const swapDefaultTrack = useGetSwapTrackingProperties();
- const transaction = useSelector(transactionSelector);
-
- const mapStrategies = useCallback(
- (strategy: FeeStrategy) =>
- strategy.label === "slow" && disableSlowStrategy
- ? {
- ...strategy,
- disabled: true,
- }
- : strategy,
- [disableSlowStrategy],
- );
-
- return (
-
-
-
-
- {transaction && mainAccount && (
-
- )}
-
-
- );
-}
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/ProvidersSection.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/ProvidersSection.tsx
deleted file mode 100644
index 1e8131780af1..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/ProvidersSection.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from "react";
-import styled from "styled-components";
-
-const Container = styled.div`
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- min-height: 20px;
-`;
-type ProvidersSectionProps = {
- children: React.ReactNode;
-};
-
-const ProvidersSection = ({ children }: ProvidersSectionProps) => {children};
-export default ProvidersSection;
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/SectionRate.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/SectionRate.tsx
deleted file mode 100644
index a2717986655f..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/SectionRate.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
- RatesReducerState,
- SwapSelectorStateType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import React from "react";
-import Rates from "../Rates";
-import ProvidersSection from "./ProvidersSection";
-
-export type SectionRateProps = {
- provider?: string;
- ratesState: RatesReducerState;
- fromCurrency: SwapSelectorStateType["currency"];
- toCurrency: SwapSelectorStateType["currency"];
- countdownSecondsToRefresh: number | undefined;
-};
-
-const SectionRate = ({
- provider,
- fromCurrency,
- toCurrency,
- ratesState,
- countdownSecondsToRefresh,
-}: SectionRateProps) => {
- const rates = ratesState.value;
-
- return (
-
-
-
- );
-};
-export default React.memo(SectionRate);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/index.tsx
deleted file mode 100644
index 3a1a7023c215..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { SwapDataType } from "@ledgerhq/live-common/exchange/swap/types";
-import React from "react";
-import styled from "styled-components";
-import SectionRate from "./SectionRate";
-
-const Form = styled.section`
- display: grid;
- row-gap: 1.375rem;
- color: white;
-`;
-type SwapFormProvidersProps = {
- swap: SwapDataType;
- countdownSecondsToRefresh: number | undefined;
- provider?: string;
-};
-
-const SwapFormProviders = ({
- swap,
- provider,
- countdownSecondsToRefresh,
-}: SwapFormProvidersProps) => {
- const { currency: fromCurrency } = swap.from;
- const { currency: toCurrency } = swap.to;
-
- return (
-
- );
-};
-export default React.memo(SwapFormProviders);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/types.ts b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/types.ts
deleted file mode 100644
index 82625ce5fe8d..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormRates/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { SwapTransactionType } from "@ledgerhq/live-common/exchange/swap/types";
-
-export type FormProvidersSections = "provider" | "fees" | "rate" | "target";
-export type FormProvidersProps = {
- provider?: string;
- rate?: string;
- fees?: string;
- onProviderChange: Function;
- onFeesChange: Function;
- onTargetChange: Function;
- swapTransaction: SwapTransactionType;
-};
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FormInputs.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FormInputs.tsx
deleted file mode 100644
index 4ca1d2258d46..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FormInputs.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import {
- SwapDataType,
- SwapSelectorStateType,
- SwapTransactionType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import BigNumber from "bignumber.js";
-import React from "react";
-import styled from "styled-components";
-import { track } from "~/renderer/analytics/segment";
-import Box from "~/renderer/components/Box";
-import Button from "~/renderer/components/Button";
-import ArrowsUpDown from "~/renderer/icons/ArrowsUpDown";
-import { useGetSwapTrackingProperties } from "../../utils/index";
-import FromRow from "./FromRow";
-import ToRow from "./ToRow";
-
-type FormInputsProps = {
- fromAccount: SwapSelectorStateType["account"];
- toAccount: SwapSelectorStateType["account"];
- fromAmount: SwapSelectorStateType["amount"];
- toCurrency: SwapSelectorStateType["currency"];
- toAmount: SwapSelectorStateType["amount"];
- setFromAccount: SwapTransactionType["setFromAccount"];
- setFromAmount: SwapTransactionType["setFromAmount"];
- setToCurrency: SwapTransactionType["setToCurrency"];
- toggleMax: SwapTransactionType["toggleMax"];
- reverseSwap: SwapTransactionType["reverseSwap"];
- isMaxEnabled?: boolean;
- fromAmountError?: Error;
- fromAmountWarning?: Error;
- isSwapReversable: boolean;
- provider: string | undefined | null;
- loadingRates: boolean;
- isSendMaxLoading: boolean;
- updateSelectedRate: SwapDataType["updateSelectedRate"];
- counterValue?: BigNumber;
-};
-
-type SwapButtonProps = {
- onClick: SwapTransactionType["reverseSwap"];
- disabled: boolean;
-};
-
-const RoundButton = styled(Button)`
- padding: 8px;
- border-radius: 9999px;
- height: initial;
-`;
-
-const Main = styled.section`
- display: flex;
- flex-direction: column;
- margin-bottom: 5px;
- row-gap: 12px;
-`;
-
-function SwapButton({ onClick, disabled }: SwapButtonProps): JSX.Element {
- return (
-
-
-
- );
-}
-
-export default function FormInputs({
- fromAccount = undefined,
- toAccount,
- fromAmount = undefined,
- isMaxEnabled = false,
- setFromAccount,
- setFromAmount,
- toCurrency,
- toAmount,
- setToCurrency,
- toggleMax,
- fromAmountError,
- fromAmountWarning,
- reverseSwap,
- isSwapReversable,
- provider,
- loadingRates,
- isSendMaxLoading,
- updateSelectedRate,
- counterValue,
-}: FormInputsProps) {
- const swapDefaultTrack = useGetSwapTrackingProperties();
- const reverseSwapAndTrack = () => {
- track("button_clicked2", {
- button: "switch",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- });
- reverseSwap();
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FormLabel.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FormLabel.tsx
deleted file mode 100644
index 2f87f004bf75..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FormLabel.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from "react";
-import Text from "~/renderer/components/Text";
-
-export function FormLabel({ children }: { children?: React.ReactNode }) {
- return (
-
- {children}
-
- );
-}
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FromRow.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FromRow.tsx
deleted file mode 100644
index 2280c012937b..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/FromRow.tsx
+++ /dev/null
@@ -1,242 +0,0 @@
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import styled from "styled-components";
-import { getAccountCurrency } from "@ledgerhq/live-common/account/index";
-import Box from "~/renderer/components/Box";
-import InputCurrency from "~/renderer/components/InputCurrency";
-import { ErrorContainer } from "~/renderer/components/Input";
-import { SelectAccount } from "~/renderer/components/SelectAccount";
-import Switch from "~/renderer/components/Switch";
-import Text from "~/renderer/components/Text";
-import { amountInputContainerProps, renderAccountValue, selectRowStylesMap } from "./utils";
-import { FormLabel } from "./FormLabel";
-import {
- SwapSelectorStateType,
- SwapTransactionType,
- SwapDataType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import { track } from "~/renderer/analytics/segment";
-import { useGetSwapTrackingProperties } from "../../utils/index";
-import { useCurrenciesByMarketcap } from "@ledgerhq/live-common/currencies/hooks";
-import { listCryptoCurrencies, listTokens } from "@ledgerhq/live-common/currencies/index";
-import { AccountLike } from "@ledgerhq/types-live";
-import BigNumber from "bignumber.js";
-import { TranslatedError } from "~/renderer/components/TranslatedError/TranslatedError";
-import { WarningSolidMedium } from "@ledgerhq/react-ui/assets/icons";
-import { useSwapableAccounts } from "@ledgerhq/live-common/exchange/swap/hooks/index";
-import { useSelector } from "react-redux";
-import { flattenAccountsSelector } from "~/renderer/reducers/accounts";
-import { useMaybeAccountUnit } from "~/renderer/hooks/useAccountUnit";
-import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
-
-const SwapStatusContainer = styled.div<{ isError: boolean }>(
- ({ theme: { space, colors }, isError }) => `
- margin-top: ${space[1]}px;
- display: grid;
- grid-template-columns: 16px auto;
- align-items: center;
- column-gap: ${space[1]}px;
- color: ${isError ? colors.error.c70 : colors.warning};
-`,
-);
-
-const SwapStatusText = styled(Text)(
- () => `
- & button, a {
- text-decoration: underline;
- cursor: pointer;
- }
-`,
-);
-
-/* @dev: Yeah, Im sorry if you read this, design asked us to
- override the input component when it is called from the swap form. */
-const InputSection = styled(Box)`
- & ${ErrorContainer} {
- font-weight: 500;
- font-size: 11px;
- text-align: right;
- margin-left: calc(calc(100% + 30px) * -1);
- margin-top: 6px;
- align-self: flex-end;
- margin-right: -15px;
- }
-`;
-
-// Pick a default source account if none are selected.
-// TODO use live-common once its ready
-const usePickDefaultAccount = (
- accounts: AccountLike[],
- fromAccount: AccountLike | undefined,
- setFromAccount: (acc?: AccountLike) => void,
-): void => {
- const list = [...listCryptoCurrencies(), ...listTokens()];
- const allCurrencies = useCurrenciesByMarketcap(list);
- useEffect(() => {
- if (!fromAccount && allCurrencies.length > 0) {
- allCurrencies.some(({ id }) => {
- const filteredAcc = accounts.filter(
- acc =>
- getAccountCurrency(acc)?.id === id &&
- acc.balance.gt(0) &&
- (!("disabled" in acc) || !acc.disabled),
- );
- if (filteredAcc.length > 0) {
- const defaultAccount = filteredAcc
- .sort((a, b) => b.balance.minus(a.balance).toNumber())
- .find(Boolean);
- setFromAccount(defaultAccount);
- return true;
- }
- return false;
- });
- }
- }, [accounts, allCurrencies, fromAccount, setFromAccount]);
-};
-
-type Props = {
- fromAccount: SwapSelectorStateType["account"];
- setFromAccount: SwapTransactionType["setFromAccount"];
- toggleMax: SwapTransactionType["toggleMax"];
- fromAmount: SwapSelectorStateType["amount"];
- setFromAmount: SwapTransactionType["setFromAmount"];
- isMaxEnabled: boolean;
- fromAmountError?: Error;
- fromAmountWarning?: Error;
- provider: string | undefined | null;
- isSendMaxLoading: boolean;
- updateSelectedRate: SwapDataType["updateSelectedRate"];
-};
-
-function FromRow({
- fromAmount,
- setFromAmount,
- fromAccount,
- setFromAccount,
- isMaxEnabled,
- toggleMax,
- fromAmountError,
- fromAmountWarning,
- isSendMaxLoading,
- updateSelectedRate,
-}: Props) {
- const swapDefaultTrack = useGetSwapTrackingProperties();
- const flattenedAccounts = useSelector(flattenAccountsSelector);
- const accounts = useSwapableAccounts({ accounts: flattenedAccounts });
- const unit = useMaybeAccountUnit(fromAccount);
- const { t } = useTranslation();
- usePickDefaultAccount(accounts, fromAccount, setFromAccount);
-
- if (!fromAccount) return null;
-
- const trackEditAccount = () => {
- track("button_clicked2", {
- button: "Edit source account",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- });
- };
-
- const setAccountAndTrack = (account: AccountLike) => {
- updateSelectedRate();
- const name = account ? getDefaultAccountName(account) : undefined;
- track("button_clicked2", {
- button: "New source account",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- account: name,
- });
- setFromAccount(account);
- };
-
- const setValue = (fromAmount: BigNumber) => {
- track("button_clicked2", {
- button: "Amount input",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- amount: null,
- });
- updateSelectedRate();
- setFromAmount(fromAmount);
- };
-
- const toggleMaxAndTrack = (state: unknown) => {
- track("button_clicked2", {
- button: "max",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- state,
- });
- toggleMax();
- };
-
- return (
- <>
-
- {t("swap2.form.from.title")}
-
-
- {t("swap2.form.from.max")}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {(!!fromAmountError || !!fromAmountWarning) && (
-
-
-
-
-
-
- )}
-
- );
-}
-
-export default React.memo(FromRow);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/ToRow.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/ToRow.tsx
deleted file mode 100644
index 4a88bcba7fa9..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/ToRow.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import {
- useFetchCurrencyTo,
- usePickDefaultCurrency,
- useSelectableCurrencies,
-} from "@ledgerhq/live-common/exchange/swap/hooks/index";
-import {
- SwapDataType,
- SwapSelectorStateType,
- SwapTransactionType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
-import BigNumber from "bignumber.js";
-import React from "react";
-import { Trans } from "react-i18next";
-import styled from "styled-components";
-import { track } from "~/renderer/analytics/segment";
-import Box from "~/renderer/components/Box/Box";
-import CounterValue from "~/renderer/components/CounterValue";
-import {
- BaseContainer as BaseInputContainer,
- Container as InputContainer,
-} from "~/renderer/components/Input";
-import InputCurrency from "~/renderer/components/InputCurrency";
-import SelectCurrency from "~/renderer/components/SelectCurrency";
-import { useGetSwapTrackingProperties } from "../../utils/index";
-import { FormLabel } from "./FormLabel";
-import { amountInputContainerProps, renderCurrencyValue, selectRowStylesMap } from "./utils";
-
-type Props = {
- fromAccount: SwapSelectorStateType["account"];
- toAccount: SwapSelectorStateType["account"];
- toCurrency: SwapSelectorStateType["currency"];
- setToCurrency: SwapTransactionType["setToCurrency"];
- toAmount: SwapSelectorStateType["amount"];
- provider: string | undefined | null;
- loadingRates: boolean;
- updateSelectedRate: SwapDataType["updateSelectedRate"];
- counterValue?: BigNumber;
-};
-
-const InputCurrencyContainer = styled(Box)`
- ${InputContainer} {
- display: flex;
- background: none;
- flex-direction: column;
- align-items: flex-end;
- justify-content: center;
- }
-
- ${BaseInputContainer} {
- flex: 0;
- }
-`;
-
-function ToRow({
- toCurrency,
- setToCurrency,
- toAmount,
- fromAccount,
- loadingRates,
- updateSelectedRate,
- counterValue,
-}: Props) {
- const { data: currenciesTo, isLoading: currenciesToIsLoading } = useFetchCurrencyTo({
- fromCurrencyAccount: fromAccount,
- });
- const swapDefaultTrack = useGetSwapTrackingProperties();
- const currencies = useSelectableCurrencies({
- allCurrencies: currenciesTo ?? [],
- });
- const unit = toCurrency?.units[0];
- usePickDefaultCurrency(currencies, toCurrency, setToCurrency);
- const trackEditCurrency = () =>
- track("button_clicked2", {
- button: "Edit target currency",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- });
- const setCurrencyAndTrack = (currency: CryptoOrTokenCurrency | null | undefined) => {
- updateSelectedRate();
- track("button_clicked2", {
- button: "New target currency",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- currency: currency?.ticker || currency?.name,
- });
- setToCurrency(currency || undefined);
- };
-
- return (
- <>
-
-
-
-
-
-
-
-
-
-
- null}
- data-testid="destination-currency-amount"
- value={unit ? toAmount : null}
- disabled
- placeholder="-"
- textAlign="right"
- fontWeight={600}
- color="palette.text.shade40"
- containerProps={amountInputContainerProps}
- unit={unit}
- loading={loadingRates}
- renderRight={
- toCurrency &&
- unit &&
- toAmount &&
- !loadingRates && (
-
- )
- }
- />
-
-
-
- );
-}
-export default React.memo(ToRow);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/index.ts b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/index.ts
deleted file mode 100644
index 562594714958..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./FormInputs";
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/utils.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/utils.tsx
deleted file mode 100644
index 9730883893c1..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSelectors/utils.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from "react";
-import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
-import { CreateStylesReturnType } from "~/renderer/components/Select/createStyles";
-import { AccountOption, Option as SelectAccountOption } from "~/renderer/components/SelectAccount";
-import { CurrencyOption } from "~/renderer/components/SelectCurrency";
-import { OptionTypeBase } from "react-select";
-import { ThemeConfig } from "react-select/src/theme";
-
-export const selectRowStylesMap: (
- a: CreateStylesReturnType & ThemeConfig,
-) => CreateStylesReturnType = styles => ({
- ...styles,
- control: (provided, state) => ({
- ...styles?.control?.(provided, state),
- borderTopRightRadius: 0,
- borderBottomRightRadius: 0,
- }),
- menu: (provided, state) => ({
- ...styles?.menu?.(provided, state),
- width: "200%",
- }),
- valueContainer: (styles: object) => ({
- ...styles,
- height: "100%",
- }),
-});
-
-export const amountInputContainerProps = {
- noBorderLeftRadius: true,
-};
-
-export const renderAccountValue = ({ data }: { data: SelectAccountOption }) =>
- data.account ? (
-
- ) : null;
-
-export const renderCurrencyValue = ({ data: currency }: { data: CryptoOrTokenCurrency }) => {
- return currency ? (
-
- ) : null;
-};
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionFees.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionFees.tsx
deleted file mode 100644
index 00bbbd5890af..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionFees.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import React, { useMemo, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { useSelector } from "react-redux";
-import { getMainAccount } from "@ledgerhq/live-common/account/index";
-import { context } from "~/renderer/drawers/Provider";
-import SummaryLabel from "./SummaryLabel";
-import SummaryValue, { NoValuePlaceholder } from "./SummaryValue";
-import SummarySection from "./SummarySection";
-import FeesDrawer from "../FeesDrawer";
-import {
- SwapTransactionType,
- SwapSelectorStateType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import { track } from "~/renderer/analytics/segment";
-import { rateSelector } from "~/renderer/actions/swap";
-import FormattedVal from "~/renderer/components/FormattedVal";
-import Box from "~/renderer/components/Box";
-import Text from "~/renderer/components/Text";
-import TachometerHigh from "~/renderer/icons/TachometerHigh";
-import TachometerLow from "~/renderer/icons/TachometerLow";
-import TachometerMedium from "~/renderer/icons/TachometerMedium";
-import styled from "styled-components";
-import { useGetSwapTrackingProperties } from "../../utils/index";
-import { EDITABLE_FEE_FAMILIES } from "@ledgerhq/live-common/exchange/swap/const/blockchain";
-import { useMaybeAccountUnit } from "~/renderer/hooks/useAccountUnit";
-
-type Strategies = "slow" | "medium" | "fast" | "advanced";
-
-const FEES_STRATEGY_ICONS: {
- [x in Strategies]: (a: { color?: string; size?: number }) => React.ReactElement<"svg">;
-} = {
- slow: TachometerLow,
- medium: TachometerMedium,
- fast: TachometerHigh,
- advanced: TachometerHigh,
-};
-const IconSection = styled(Box)`
- flex-direction: row;
- column-gap: 0.25rem;
- color: ${props => props.theme.colors.palette.text.shade40};
-`;
-const Separator = styled.div`
- width: 3px;
- height: 3px;
- background-color: ${props => props.theme.colors.palette.text.shade40};
- border-radius: 9999px;
- align-self: center;
- margin-left: 2px;
-`;
-
-type Props = {
- transaction: SwapTransactionType["transaction"];
- account: SwapSelectorStateType["account"];
- parentAccount: SwapSelectorStateType["parentAccount"];
- currency: SwapSelectorStateType["currency"];
- status: SwapTransactionType["status"];
- updateTransaction: SwapTransactionType["updateTransaction"];
- setTransaction: SwapTransactionType["setTransaction"];
- provider: string | undefined | null;
- hasRates: boolean;
-};
-
-const SectionFees = ({
- transaction,
- account,
- parentAccount,
- currency,
- status,
- updateTransaction,
- setTransaction,
- provider,
- hasRates,
-}: Props) => {
- const { t } = useTranslation();
- const { setDrawer } = React.useContext(context);
- const exchangeRate = useSelector(rateSelector);
- const mainFromAccount = account && getMainAccount(account, parentAccount);
- const mainAccountUnit = useMaybeAccountUnit(mainFromAccount);
- const estimatedFees = status?.estimatedFees;
- const showSummaryValue = mainFromAccount && estimatedFees && estimatedFees.gt(0);
- const family = mainFromAccount?.currency.family;
- const canEdit =
- hasRates && showSummaryValue && transaction && family && EDITABLE_FEE_FAMILIES.includes(family);
- const swapDefaultTrack = useGetSwapTrackingProperties();
-
- const StrategyIcon = useMemo(
- () =>
- (transaction?.feesStrategy &&
- FEES_STRATEGY_ICONS[transaction?.feesStrategy as keyof typeof FEES_STRATEGY_ICONS]) ||
- undefined,
- [transaction?.feesStrategy],
- );
-
- // Deselect slow strategy if the exchange rate is changed to fixed.
- useEffect(
- () => {
- if (exchangeRate?.tradeMethod === "fixed" && transaction?.feesStrategy === "slow") {
- updateTransaction(t => ({
- ...t,
- feesStrategy: "medium",
- }));
- }
- },
- // eslint-disable-next-line
- [transaction?.feesStrategy, exchangeRate?.tradeMethod, updateTransaction],
- );
-
- const handleChange = useMemo(
- () =>
- (canEdit &&
- (() => {
- track("button_clicked2", {
- button: "change network fees",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- });
- setDrawer(
- FeesDrawer,
- {
- setTransaction,
- updateTransaction,
- mainAccount: mainFromAccount,
- parentAccount: parentAccount,
- currency,
- status,
- disableSlowStrategy: exchangeRate?.tradeMethod === "fixed",
- provider,
- },
- {
- forceDisableFocusTrap: true,
- },
- );
- })) ||
- undefined,
- [
- canEdit,
- swapDefaultTrack,
- setDrawer,
- setTransaction,
- updateTransaction,
- mainFromAccount,
- parentAccount,
- currency,
- status,
- exchangeRate?.tradeMethod,
- provider,
- ],
- );
-
- const summaryValue = canEdit ? (
- <>
-
- {StrategyIcon ? : null}
-
- {t(`fees.${transaction?.feesStrategy ?? "custom"}`)}
-
-
-
-
-
- ) : estimatedFees ? (
-
- ) : (
-
- );
-
- return (
-
-
- {summaryValue}
-
- );
-};
-
-export default React.memo(SectionFees);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionInformative.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionInformative.tsx
deleted file mode 100644
index bfef46709e54..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionInformative.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from "react";
-import styled from "styled-components";
-import { rgba } from "~/renderer/styles/helpers";
-import Button from "~/renderer/components/Button";
-import TextBase from "~/renderer/components/Text";
-
-const Container = styled.div`
- display: flex;
- justify-content: space-between;
- background-color: ${p => rgba(p.theme.colors.palette.primary.main, 0.1)};
- color: ${p => p.theme.colors.palette.primary.main};
- column-gap: 0.75rem;
- padding: 0.75rem;
- border-radius: 4px;
- align-items: center;
-`;
-const Text = styled(TextBase).attrs(() => ({
- ff: "Inter",
- fontSize: "0.875rem",
- fontWeight: 500,
- lineHeight: "1.4",
-}))`
- &:first-letter {
- text-transform: uppercase;
- }
-`;
-const TextWrappper = styled.div`
- max-width: 28rem;
-`;
-const ButtonAddAccount = styled(Button).attrs(() => ({
- primary: true,
- small: true,
-}))`
- height: 40px;
-`;
-
-type SectionInformativeProps = {
- message: string;
- ctaLabel: string;
- onClick: () => void;
-};
-
-const SectionInformative = ({ message, ctaLabel, onClick }: SectionInformativeProps) => (
-
-
- {message}
-
-
- {ctaLabel}
-
-
-);
-
-export default SectionInformative;
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionTarget.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionTarget.tsx
deleted file mode 100644
index 29400edebe52..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionTarget.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-import {
- SwapSelectorStateType,
- SwapTransactionType,
-} from "@ledgerhq/live-common/exchange/swap/types";
-import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
-import { AccountLike } from "@ledgerhq/types-live";
-import React, { useCallback, useEffect, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
-import { openModal } from "~/renderer/actions/modals";
-import { track } from "~/renderer/analytics/segment";
-import CryptoCurrencyIcon from "~/renderer/components/CryptoCurrencyIcon";
-import { context } from "~/renderer/drawers/Provider";
-import { useMaybeAccountName } from "~/renderer/reducers/wallet";
-import { useGetSwapTrackingProperties } from "../../utils/index";
-import TargetAccountDrawer from "../TargetAccountDrawer";
-import { useIsSwapLiveFlagEnabled } from "../../hooks/useIsSwapLiveFlagEnabled";
-import SectionInformative from "./SectionInformative";
-import SummaryLabel from "./SummaryLabel";
-import SummarySection from "./SummarySection";
-import SummaryValue, { Container, Text, NoValuePlaceholder } from "./SummaryValue";
-import styled from "styled-components";
-
-const AccountSectionContainer = styled(SummarySection)`
- column-gap: 12px;
- display: grid;
- grid-template-columns: 1fr 1fr;
-
- ${Container}, ${Text} {
- flex-shrink: 1;
- }
-
- ${Container} ${Text} {
- overflow: hidden;
- text-overflow: ellipsis;
- }
-`;
-
-const AccountSection = ({
- account,
- currency,
- handleChange,
-}: {
- account: SwapSelectorStateType["account"];
- currency: TokenCurrency | CryptoCurrency;
- handleChange?: () => void;
-}) => {
- const { t } = useTranslation();
- const accountName = useMaybeAccountName(account);
-
- const swapDefaultTrack = useGetSwapTrackingProperties();
-
- const handleChangeAndTrack = useCallback(() => {
- track("button_clicked2", {
- button: "change target account",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- });
-
- if (handleChange) {
- handleChange();
- }
- }, [handleChange, swapDefaultTrack]);
-
- return (
-
-
-
- {currency ? : null}
-
-
- );
-};
-
-const PlaceholderSection = () => {
- const { t } = useTranslation();
-
- return (
-
-
-
-
-
-
- );
-};
-
-type SectionTargetProps = {
- account: SwapSelectorStateType["account"];
- currency: SwapSelectorStateType["currency"];
- setToAccount: SwapTransactionType["setToAccount"];
- targetAccounts: AccountLike[] | undefined;
- hasRates: boolean;
-};
-
-type SetDrawerStateRef = (args: {
- selectedAccount: AccountLike | undefined;
- targetAccounts: AccountLike[] | undefined;
-}) => void;
-const SectionTarget = ({
- account,
- currency,
- setToAccount,
- targetAccounts,
- hasRates,
-}: SectionTargetProps) => {
- const { t } = useTranslation();
- const dispatch = useDispatch();
- const { setDrawer } = React.useContext(context);
- const swapDefaultTrack = useGetSwapTrackingProperties();
- const isDemo0Enabled = useIsSwapLiveFlagEnabled("ptxSwapLiveAppDemoZero");
-
- const handleAddAccount = () => {
- track("button_clicked2", {
- button: "add account",
- page: "Page Swap Form",
- ...swapDefaultTrack,
- });
- dispatch(openModal("MODAL_ADD_ACCOUNTS", { currency, ...swapDefaultTrack }));
- };
-
- const hideEdit = !targetAccounts || targetAccounts.length < 2;
-
- // Using a ref to keep the drawer state synced.
- const setDrawerStateRef = useRef(null);
- useEffect(() => {
- setDrawerStateRef.current &&
- setDrawerStateRef.current({
- selectedAccount: account,
- targetAccounts,
- });
- }, [account, targetAccounts]);
-
- const showDrawer = () => {
- setDrawer(TargetAccountDrawer, {
- accounts: targetAccounts,
- selectedAccount: account,
- setToAccount: setToAccount,
- setDrawerStateRef: setDrawerStateRef,
- });
- };
-
- const handleEditAccount = hideEdit ? undefined : showDrawer;
-
- if (!currency || (isDemo0Enabled && !hasRates)) return ;
-
- if (!account)
- return (
-
- );
-
- return ;
-};
-
-export default React.memo(SectionTarget);
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SummaryLabel.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SummaryLabel.tsx
deleted file mode 100644
index 714f5b5e776f..000000000000
--- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SummaryLabel.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from "react";
-import styled from "styled-components";
-import Text from "~/renderer/components/Text";
-import Tooltip from "~/renderer/components/Tooltip";
-import IconInfoCircle from "~/renderer/icons/InfoCircle";
-
-const Container = styled.div`
- display: flex;
- align-items: end;
- column-gap: 0.25rem;
- color: ${p => p.theme.colors.palette.text.shade40};
-`;
-const Label = styled(Text).attrs(() => ({
- ff: "Inter",
- fontSize: "13px",
- fontWeight: 500,
- lineHeight: "1.4",
-}))`
- &:first-letter {
- text-transform: uppercase;
- }
-`;
-
-type DetailsProps = {
- details?: string;
-};
-
-const Details = ({ details }: DetailsProps) => {
- if (!details) return null;
- return (
-
-
-
- );
-};
-
-/* This component fetch the current label and the optional details from the section's
- ** context and render them if possible.
- */
-const SummaryLabel = ({ label, details }: { label: string; details?: string }) => {
- return (
-
-
- {details ?