fix: pass correct target and source currency ids to swap live app (#6914

)
LedgerHQ · May 23, 2024 · 65821db · 65821db
1 parent 9393c68
commit 65821db
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/.changeset/brave-waves-smile.md 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
@@ -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
@@ -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