@ledgerhq/live-common 34.48.0-nightly.2 → 34.48.0-nightly.4

package/src/hw/getDeviceNameMaxLength.test.ts

@@ -62,6 +62,22 @@ describe("getDeviceNameMaxLength", () => {
       }),
     ).toBe(20);
   });
+  test("Europa of any version should max at 20", async () => {
+    expect(
+      getDeviceNameMaxLength({
+        deviceModelId: DeviceModelId.europa,
+        version: "0.0.1",
+      }),
+    ).toBe(20);
+  });
+  test("Apex of any version should max at 20", async () => {
+    expect(
+      getDeviceNameMaxLength({
+        deviceModelId: DeviceModelId.apex,
+        version: "0.0.1",
+      }),
+    ).toBe(20);
+  });
   test("Other models should just return 17 as a fallback", async () => {
     expect(
       getDeviceNameMaxLength({

package/src/hw/getDeviceNameMaxLength.ts

@@ -31,6 +31,8 @@ const getDeviceNameMaxLength = (props: Props): number => {
     }
 
     case DeviceModelId.stax:
+    case DeviceModelId.europa:
+    case DeviceModelId.apex:
       maxLength = 20;
       break;
   }

package/src/modularDrawer/data/state-manager/api.ts

@@ -30,7 +30,7 @@ function transformAssetsResponse(
 export const assetsDataApi = createApi({
   reducerPath: "assetsDataApi",
   baseQuery: fetchBaseQuery({
-    baseUrl: __DEV__ ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD"),
+    baseUrl: "", // Will be overridden in query
   }),
   tagTypes: [AssetsDataTags.Assets],
   endpoints: build => ({
@@ -49,8 +49,10 @@ export const assetsDataApi = createApi({
           additionalData: [AssetsAdditionalData.Apy, AssetsAdditionalData.MarketTrend],
         };
 
+        const baseUrl = queryArg.isStaging ? getEnv("DADA_API_STAGING") : getEnv("DADA_API_PROD");
+
         return {
-          url: "assets",
+          url: `${baseUrl}assets`,
           params,
         };
       },

package/src/modularDrawer/data/state-manager/types.ts

@@ -15,6 +15,7 @@ export interface GetAssetsDataParams {
   useCase?: string;
   product: "llm" | "lld";
   version: string;
+  isStaging?: boolean;
 }
 
 export interface PageParam {

package/src/modularDrawer/hooks/useAssetsData.ts

@@ -24,6 +24,7 @@ export function useAssetsData({
   areCurrenciesFiltered,
   product,
   version,
+  isStaging,
 }: {
   search?: string;
   currencyIds?: string[];
@@ -31,6 +32,7 @@ export function useAssetsData({
   areCurrenciesFiltered?: boolean;
   product: "llm" | "lld";
   version: string;
+  isStaging?: boolean;
 }) {
   const { data, isLoading, error, fetchNextPage, isSuccess, refetch, isFetching, isError } =
     useGetAssetsDataInfiniteQuery({
@@ -39,6 +41,7 @@ export function useAssetsData({
       currencyIds: areCurrenciesFiltered ? currencyIds : undefined,
       product,
       version,
+      isStaging,
     });
 
   const joinedPages = useMemo(() => {

package/src/wallet-api/Exchange/server.ts

@@ -53,7 +53,6 @@ import { getSwapStepFromError } from "../../exchange/error";
 import { postSwapCancelled } from "../../exchange/swap";
 import { DeviceModelId } from "@ledgerhq/types-devices";
 import { setBroadcastTransaction } from "../../exchange/swap/setBroadcastTransaction";
-import { FAMILIES_MAPPING_LL_TO_WAPI } from "../constants";
 
 export { ExchangeType };
 
@@ -486,14 +485,11 @@ export const handlers = ({
       });
 
       const mainFromAccount = getMainAccount(fromAccount, fromParentAccount);
-      const mainFromAccountFamily =
-        FAMILIES_MAPPING_LL_TO_WAPI[mainFromAccount.currency.family] ||
-        mainFromAccount.currency.family;
 
-      if (transaction.family !== mainFromAccountFamily) {
+      if (transaction.family !== mainFromAccount.currency.family) {
         return Promise.reject(
           new Error(
-            `Account and transaction must be from the same family. Account family: ${mainFromAccountFamily}, Transaction family: ${transaction.family}`,
+            `Account and transaction must be from the same family. Account family: ${mainFromAccount.currency.family}, Transaction family: ${transaction.family}`,
           ),
         );
       }
@@ -804,27 +800,34 @@ async function getStrategy(
     delete customFeeConfig.utxoStrategy;
   }
 
-  // Normalize family key for strategy lookup
-  const familyKey = FAMILIES_MAPPING_LL_TO_WAPI[family] || family;
-  const strategy = transactionStrategy?.[familyKey];
+  const strategy = transactionStrategy?.[family];
 
   if (!strategy) {
-    throw new Error(`No transaction strategy found for family: ${familyKey}`);
+    throw new Error(`No transaction strategy found for family: ${family}`);
+  }
+
+  // Convert customFeeConfig values to BigNumber
+  const convertedCustomFeeConfig: { [key: string]: BigNumber } = {};
+  if (customFeeConfig) {
+    for (const [key, value] of Object.entries(customFeeConfig)) {
+      convertedCustomFeeConfig[key] = new BigNumber(value?.toString() || 0);
+    }
   }
 
   try {
     return await strategy({
-      family: familyKey,
-      amount,
+      family,
+      amount: new BigNumber(amount),
       recipient,
-      customFeeConfig: customFeeConfig || {},
+      customFeeConfig: convertedCustomFeeConfig,
       payinExtraId,
       extraTransactionParameters,
       customErrorType,
     });
   } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
     throw new Error(
-      `Failed to execute transaction strategy for family: ${familyKey}. Reason: ${(error as Error).message}`,
+      `Failed to execute transaction strategy for family: ${family}. Reason: ${errorMessage}`,
     );
   }
 }