From 195357841c06765ef2cee34711de62eee4fac8bb Mon Sep 17 00:00:00 2001 From: Liviu Ciulinaru Date: Thu, 6 Jun 2024 13:31:57 +0200 Subject: [PATCH] fix(live-12813): remove the swap webview conditional for demo0 (#7022) * fix: rm conditionanl webview display chore: add changeset * fix: demo 1 enable check --- .changeset/brown-houses-beg.md | 5 +++++ .../screens/exchange/Swap2/Form/SwapWebView.tsx | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .changeset/brown-houses-beg.md diff --git a/.changeset/brown-houses-beg.md b/.changeset/brown-houses-beg.md new file mode 100644 index 00000000000..9819b11ea98 --- /dev/null +++ b/.changeset/brown-houses-beg.md @@ -0,0 +1,5 @@ +--- +"ledger-live-desktop": patch +--- + +remove the swap webview conditional for demo0 diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/SwapWebView.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/SwapWebView.tsx index 7fc6ccb0ba8..93ec2ee0def 100644 --- a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/SwapWebView.tsx +++ b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/SwapWebView.tsx @@ -112,7 +112,8 @@ const SwapWebView = ({ const locale = useSelector(languageSelector); const redirectToHistory = useRedirectToSwapHistory(); const enablePlatformDevTools = useSelector(enablePlatformDevToolsSelector); - + const manifestID = useSwapLiveAppManifestID(); + const isDemo1Enabled = manifestID?.startsWith(SwapWebManifestIDs.Demo1); const hasSwapState = !!swapState; const customPTXHandlers = usePTXCustomHandlers(manifest); @@ -261,10 +262,12 @@ const SwapWebView = ({ // Keep the previous UI // Display only the disabled swap button + if ( - swapState.error || - swapState.fromAmount === "0" || - !(fromCurrency && addressFrom && toCurrency && addressTo) + isDemo1Enabled && + (swapState.error || + swapState.fromAmount === "0" || + !(fromCurrency && addressFrom && toCurrency && addressTo)) ) { return (