From 0af25c1cf7aecdbb83cba485a18d9e03f6c02e35 Mon Sep 17 00:00:00 2001 From: Chuck Ng Date: Fri, 10 May 2024 09:39:52 +0100 Subject: [PATCH 1/4] feat(LIVE-9328): migrate more native swap UI --- .../Swap2/Form/Migrations/SwapMigrationUI.tsx | 19 ++++++++++++++++++- .../screens/exchange/Swap2/Form/index.tsx | 9 --------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx index 2d04ffd91f3c..cbd9e8770521 100644 --- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx +++ b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx @@ -8,6 +8,8 @@ import { SwapTransactionType } from "@ledgerhq/live-common/exchange/swap/types"; import ButtonBase from "~/renderer/components/Button"; import SwapFormRates from "../FormRates"; import { SwapWebManifestIDs } from "../SwapWebView"; +import LoadingState from "../Rates/LoadingState"; +import SwapFormSummary from "../FormSummary"; const Button = styled(ButtonBase)` width: 100%; @@ -40,6 +42,12 @@ export const SwapMigrationUI = (props: SwapMigrationUIProps) => { } = props; const { t } = useTranslation(); + const nativeLoadingUI = pageState === "loading" ? : null; + const nativeNetworkFeesUI = + pageState === "loading" ? ( + + ) : null; + const nativeQuotesUI = pageState === "loaded" ? ( { */ const allNativeUI = ( <> + {nativeLoadingUI} + {nativeNetworkFeesUI} {nativeQuotesUI} {nativeExchangeButtonUI} @@ -82,6 +92,8 @@ export const SwapMigrationUI = (props: SwapMigrationUIProps) => { */ return ( <> + {nativeLoadingUI} + {nativeNetworkFeesUI} {nativeQuotesUI} {liveApp} @@ -93,7 +105,12 @@ export const SwapMigrationUI = (props: SwapMigrationUIProps) => { * - Exchange Button * - Quotes UI */ - return <>{liveApp}; + return ( + <> + {nativeNetworkFeesUI} + {liveApp} + + ); /** * Fall back to show all native UI diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx index f7e7370938c4..453e87ea2754 100644 --- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx +++ b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx @@ -25,7 +25,6 @@ import ExchangeDrawer from "./ExchangeDrawer/index"; import SwapFormSelectors from "./FormSelectors"; import useFeature from "@ledgerhq/live-common/featureFlags/useFeature"; import { accountToWalletAPIAccount } from "@ledgerhq/live-common/wallet-api/converters"; -import LoadingState from "./Rates/LoadingState"; import EmptyState from "./Rates/EmptyState"; import { AccountLike } from "@ledgerhq/types-live"; import BigNumber from "bignumber.js"; @@ -34,7 +33,6 @@ import { OnNoRatesCallback } from "@ledgerhq/live-common/exchange/swap/types"; import SwapWebView, { SwapWebProps, useSwapLiveAppManifestID } from "./SwapWebView"; import { SwapMigrationUI } from "./Migrations/SwapMigrationUI"; import { useSwapLiveAppHook } from "~/renderer/hooks/swap-migrations/useSwapLiveAppHook"; -import SwapFormSummary from "./FormSummary"; import { useLocalLiveAppManifest } from "@ledgerhq/live-common/platform/providers/LocalLiveAppProvider/index"; import { useRemoteLiveAppManifest } from "@ledgerhq/live-common/platform/providers/RemoteLiveAppProvider/index"; import { languageSelector } from "~/renderer/reducers/settings"; @@ -454,13 +452,6 @@ const SwapForm = () => { updateSelectedRate={swapTransaction.swap.updateSelectedRate} /> {pageState === "empty" && } - {pageState === "loading" && } - - {pageState === "loaded" && ( - <> - - - )} Date: Fri, 10 May 2024 09:41:48 +0100 Subject: [PATCH 2/4] feat(LIVE-9328): changeset --- .changeset/itchy-cows-march.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/itchy-cows-march.md diff --git a/.changeset/itchy-cows-march.md b/.changeset/itchy-cows-march.md new file mode 100644 index 000000000000..bf63f52236ea --- /dev/null +++ b/.changeset/itchy-cows-march.md @@ -0,0 +1,5 @@ +--- +"ledger-live-desktop": minor +--- + +feat(LIVE-9328): migrate more native swap UI including loading state and form summary (target account and network fee) From 86e732f625677d418f6cb529874051e0bc39f1b7 Mon Sep 17 00:00:00 2001 From: Chuck Ng Date: Wed, 15 May 2024 08:22:52 +0100 Subject: [PATCH 3/4] feat(LIVE-9328): minor fix for snapshots --- .../screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx index cbd9e8770521..37c8554349eb 100644 --- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx +++ b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/Migrations/SwapMigrationUI.tsx @@ -44,7 +44,7 @@ export const SwapMigrationUI = (props: SwapMigrationUIProps) => { const nativeLoadingUI = pageState === "loading" ? : null; const nativeNetworkFeesUI = - pageState === "loading" ? ( + pageState === "loaded" ? ( ) : null; From 4f9e78e0056b1e4e7476db0942f182e0e27190a4 Mon Sep 17 00:00:00 2001 From: Chuck Ng Date: Wed, 15 May 2024 16:52:04 +0100 Subject: [PATCH 4/4] feat(LIVE-9328): fix ts --- .../src/renderer/screens/exchange/Swap2/Form/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx index 453e87ea2754..aa2ffd477f6b 100644 --- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx +++ b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/index.tsx @@ -33,7 +33,7 @@ import { OnNoRatesCallback } from "@ledgerhq/live-common/exchange/swap/types"; import SwapWebView, { SwapWebProps, useSwapLiveAppManifestID } from "./SwapWebView"; import { SwapMigrationUI } from "./Migrations/SwapMigrationUI"; import { useSwapLiveAppHook } from "~/renderer/hooks/swap-migrations/useSwapLiveAppHook"; -import { useLocalLiveAppManifest } from "@ledgerhq/live-common/platform/providers/LocalLiveAppProvider/index"; +import { useLocalLiveAppManifest } from "@ledgerhq/live-common/wallet-api/LocalLiveAppProvider/index"; import { useRemoteLiveAppManifest } from "@ledgerhq/live-common/platform/providers/RemoteLiveAppProvider/index"; import { languageSelector } from "~/renderer/reducers/settings"; import { walletSelector } from "~/renderer/reducers/wallet";