LIVE-14970: prevent undefined error on swap mobile (#8459)

LedgerHQ · Dec 3, 2024 · 1e153ea · 1e153ea
1 parent 9e52ed1
commit 1e153ea
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 16 deletions.
diff --git a/.changeset/shy-penguins-itch.md b/.changeset/shy-penguins-itch.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": minor
+---
+
+Prevent undefined error on mobile swap
diff --git a/libs/ledger-live-common/src/exchange/platform/transfer/completeExchange.ts b/libs/ledger-live-common/src/exchange/platform/transfer/completeExchange.ts
@@ -4,9 +4,9 @@ import { TransportStatusError, WrongDeviceForAccount } from "@ledgerhq/errors";
 
 import { delay } from "../../../promise";
 import {
-  isExchangeTypeNg,
-  ExchangeTypes,
   createExchange,
+  ExchangeTypes,
+  isExchangeTypeNg,
   PayloadSignatureComputedFormat,
 } from "@ledgerhq/hw-app-exchange";
 import perFamily from "../../../generated/exchange";
@@ -106,8 +106,11 @@ const completeExchange = (
 
         const payoutAddressParameters = await perFamily[
           mainPayoutCurrency.family
-        ].getSerializedAddressParameters(mainAccount.freshAddressPath, mainAccount.derivationMode);
+        ]?.getSerializedAddressParameters(mainAccount.freshAddressPath, mainAccount.derivationMode);
         if (unsubscribed) return;
+        if (!payoutAddressParameters) {
+          throw new Error(`Family not supported: ${mainPayoutCurrency.family}`);
+        }
 
         const { config: payoutAddressConfig, signature: payoutAddressConfigSignature } =
           await getCurrencyExchangeConfig(payoutCurrency);

diff --git a/libs/ledger-live-common/src/exchange/swap/completeExchange.ts b/libs/ledger-live-common/src/exchange/swap/completeExchange.ts
@@ -1,7 +1,7 @@
 import {
   TransportStatusError,
-  WrongDeviceForAccountRefund,
   WrongDeviceForAccountPayout,
+  WrongDeviceForAccountRefund,
 } from "@ledgerhq/errors";
 import { log } from "@ledgerhq/logs";
 import { firstValueFrom, from, Observable } from "rxjs";
@@ -14,14 +14,13 @@ import perFamily from "../../generated/exchange";
 import { withDevice } from "../../hw/deviceAccess";
 import { delay } from "../../promise";
 import {
-  ExchangeTypes,
   createExchange,
+  ExchangeTypes,
   getExchangeErrorMessage,
   PayloadSignatureComputedFormat,
 } from "@ledgerhq/hw-app-exchange";
 import type { CompleteExchangeInputSwap, CompleteExchangeRequestEvent } from "../platform/types";
-import { getSwapProvider } from "../providers";
-import { convertToAppExchangePartnerKey } from "../providers";
+import { convertToAppExchangePartnerKey, getSwapProvider } from "../providers";
 import { CompleteExchangeStep, convertTransportError } from "../error";
 import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 import BigNumber from "bignumber.js";
@@ -130,12 +129,15 @@ const completeExchange = (
 
         const payoutAddressParameters = await perFamily[
           mainPayoutCurrency.family
-        ].getSerializedAddressParameters(
+        ]?.getSerializedAddressParameters(
           payoutAccount.freshAddressPath,
           payoutAccount.derivationMode,
           mainPayoutCurrency.id,
         );
         if (unsubscribed) return;
+        if (!payoutAddressParameters) {
+          throw new Error(`Family not supported: ${mainPayoutCurrency.family}`);
+        }
 
         //-- Special case of SPLToken
         //- NOT READY YET
@@ -184,12 +186,15 @@ const completeExchange = (
         if (unsubscribed) return;
         const refundAddressParameters = await perFamily[
           mainRefundCurrency.family
-        ].getSerializedAddressParameters(
+        ]?.getSerializedAddressParameters(
           refundAccount.freshAddressPath,
           refundAccount.derivationMode,
           mainRefundCurrency.id,
         );
         if (unsubscribed) return;
+        if (!refundAddressParameters) {
+          throw new Error(`Family not supported: ${mainRefundCurrency.family}`);
+        }
 
         const { config: refundAddressConfig, signature: refundAddressConfigSignature } =
           await getCurrencyExchangeConfig(refundCurrency);

diff --git a/libs/ledger-live-common/src/exchange/swap/initSwap.ts b/libs/ledger-live-common/src/exchange/swap/initSwap.ts
@@ -4,12 +4,16 @@ import {
   WrongDeviceForAccountPayout,
   WrongDeviceForAccountRefund,
 } from "@ledgerhq/errors";
-import Exchange, { ExchangeTypes, RateTypes } from "@ledgerhq/hw-app-exchange";
+import Exchange, {
+  decodePayloadProtobuf,
+  ExchangeTypes,
+  RateTypes,
+} from "@ledgerhq/hw-app-exchange";
 import network from "@ledgerhq/live-network/network";
 import { log } from "@ledgerhq/logs";
 import { BigNumber } from "bignumber.js";
 import invariant from "invariant";
-import { Observable, firstValueFrom, from } from "rxjs";
+import { firstValueFrom, from, Observable } from "rxjs";
 import secp256k1 from "secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
@@ -26,9 +30,7 @@ import { delay } from "../../promise";
 import { getSwapAPIBaseURL, getSwapUserIP } from "./";
 import { mockInitSwap } from "./mock";
 import type { InitSwapInput, SwapRequestEvent } from "./types";
-import { decodePayloadProtobuf } from "@ledgerhq/hw-app-exchange";
-import { getSwapProvider } from "../providers";
-import { convertToAppExchangePartnerKey } from "../providers";
+import { convertToAppExchangePartnerKey, getSwapProvider } from "../providers";
 import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 import { CEXProviderConfig } from "../providers/swap";
 
@@ -196,12 +198,15 @@ const initSwap = (input: InitSwapInput): Observable<SwapRequestEvent> => {
         }
         const payoutAddressParameters = await perFamily[
           mainPayoutCurrency.family
-        ].getSerializedAddressParameters(
+        ]?.getSerializedAddressParameters(
           payoutAccount.freshAddressPath,
           payoutAccount.derivationMode,
           mainPayoutCurrency.id,
         );
         if (unsubscribed) return;
+        if (!payoutAddressParameters) {
+          throw new Error(`Family not supported: ${mainPayoutCurrency.family}`);
+        }
         const { config: payoutAddressConfig, signature: payoutAddressConfigSignature } =
           await getCurrencyExchangeConfig(payoutCurrency);
 
@@ -230,12 +235,15 @@ const initSwap = (input: InitSwapInput): Observable<SwapRequestEvent> => {
         }
         const refundAddressParameters = await perFamily[
           mainRefundCurrency.family
-        ].getSerializedAddressParameters(
+        ]?.getSerializedAddressParameters(
           refundAccount.freshAddressPath,
           refundAccount.derivationMode,
           mainRefundCurrency.id,
         );
         if (unsubscribed) return;
+        if (!refundAddressParameters) {
+          throw new Error(`Family not supported: ${mainRefundCurrency.family}`);
+        }
         const { config: refundAddressConfig, signature: refundAddressConfigSignature } =
           await getCurrencyExchangeConfig(refundCurrency);
         if (unsubscribed) return;