From 65821db981bedc83d48aa2043ef93582662ec193 Mon Sep 17 00:00:00 2001
From: Kieran Allen <132384348+kallen-ledger@users.noreply.github.com>
Date: Thu, 23 May 2024 12:05:36 +0100
Subject: [PATCH] fix: pass correct target and source currency ids to swap live
 app (#6914)

---
 .changeset/brave-waves-smile.md                 |  5 +++++
 .../screens/exchange/Swap2/Form/SwapWebView.tsx | 17 +++++++++++++----
 .../screens/exchange/Swap2/Form/index.tsx       |  2 ++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/brave-waves-smile.md

diff --git a/.changeset/brave-waves-smile.md b/.changeset/brave-waves-smile.md
new file mode 100644
index 00000000000..88a6e1d9cd0
--- /dev/null
+++ b/.changeset/brave-waves-smile.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Pass correct target and source currency to swap-live-app
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 3cc0545e89a..cae44fb0802 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
@@ -63,6 +63,8 @@ export type SwapWebProps = {
   manifest: LiveAppManifest;
   swapState?: Partial<SwapProps>;
   liveAppUnavailable(): void;
+  sourceCurrencyId?: string;
+  targetCurrencyId?: string;
 };
 
 export const SwapWebManifestIDs = {
@@ -88,7 +90,13 @@ const SwapWebAppWrapper = styled.div`
   flex: 1;
 `;
 
-const SwapWebView = ({ manifest, swapState, liveAppUnavailable }: SwapWebProps) => {
+const SwapWebView = ({
+  manifest,
+  swapState,
+  liveAppUnavailable,
+  sourceCurrencyId,
+  targetCurrencyId,
+}: SwapWebProps) => {
   const {
     colors: {
       palette: { type: themeType },
@@ -197,8 +205,8 @@ const SwapWebView = ({ manifest, swapState, liveAppUnavailable }: SwapWebProps)
     const searchParams = new URLSearchParams();
 
     const swapParams = {
-      from: fromCurrency,
-      to: toCurrency,
+      from: sourceCurrencyId,
+      to: targetCurrencyId,
       amountFrom: swapState?.fromAmount,
       addressFrom: addressFrom,
       addressTo: addressTo,
@@ -220,7 +228,8 @@ const SwapWebView = ({ manifest, swapState, liveAppUnavailable }: SwapWebProps)
     fromCurrency,
     swapState?.estimatedFees,
     swapState?.fromAmount,
-    toCurrency,
+    targetCurrencyId,
+    sourceCurrencyId,
   ]);
 
   // return loader???
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 09282d4c7f5..29439da4071 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
@@ -458,6 +458,8 @@ const SwapForm = () => {
         liveApp={
           swapLiveAppManifestID && manifest ? (
             <SwapWebView
+              sourceCurrencyId={sourceCurrency?.id}
+              targetCurrencyId={targetCurrency?.id}
               manifest={manifest}
               swapState={swapWebProps}
               // When live app crash, it should disable live app and fall back to native UI