Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(live-12813): remove the swap webview conditional for demo0 #7022

Merged
merged 2 commits into from
Jun 6, 2024
Merged

fix(live-12813): remove the swap webview conditional for demo0 #7022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d51b5f0
fix: rm conditionanl webview display
liviuciulinaru Jun 4, 2024
44ffdd1
fix: demo 1 enable check
liviuciulinaru Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/brown-houses-beg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

remove the swap webview conditional for demo0
11 changes: 7 additions & 4 deletions apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/SwapWebView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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 (
<Box width="100%">
Expand Down
Loading