Merge remote-tracking branch 'upstream/develop' into develop

multiversx · Feb 12, 2024 · 9b47297 · 9b47297
2 parents e67ce29 + 0f9a0be
commit 9b47297
Show file tree

Hide file tree

Showing 69 changed files with 1,425 additions and 503 deletions.
diff --git a/.changeset/fast-bananas-study.md b/.changeset/fast-bananas-study.md
@@ -0,0 +1,6 @@
+---
+"ledger-live-desktop": patch
+"live-mobile": patch
+---
+
+Add stakingProvidersEnabled A/B test trait to analytics identify for eth staking modal on both llm and lld.
diff --git a/.changeset/hip-beers-taste.md b/.changeset/hip-beers-taste.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/hw-app-btc": patch
+---
+
+update hw-app-btc doc
diff --git a/.changeset/old-timers-joke.md b/.changeset/old-timers-joke.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Add codeowner hw-app-exchange
diff --git a/.changeset/sharp-crews-rule.md b/.changeset/sharp-crews-rule.md
@@ -0,0 +1,7 @@
+---
+"@ledgerhq/hw-app-exchange": patch
+"ledger-live-desktop": patch
+"@ledgerhq/live-common": patch
+---
+
+Support base64 encodng for swap_ng type swaps
diff --git a/.changeset/young-books-enjoy.md b/.changeset/young-books-enjoy.md
@@ -0,0 +1,11 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+Refactor list apps v2:
+  - move entrypoint to `live-common/src/device/use-cases/listAppsUseCase.ts`
+  - move more of the `manager/api.ts` logic to `ManagerApiRepository`
+  - create `StubManagerApiRepository` for mocks
+  - implement some unit tests for `listApps/v2.ts`
+
+Implement `getProviderIdUseCase` that takes `forceProvider: number` as a parameter
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -62,6 +62,7 @@ apps/ledger-live-mobile/src/screens/PTX/                        @ledgerhq/ptx
 apps/ledger-live-mobile/src/screens/Swap/                       @ledgerhq/ptx
 libs/ledger-live-common/src/exchange/                           @ledgerhq/ptx
 libs/exchange-module/                                           @ledgerhq/ptx
+libs/ledgerjs/packages/hw-app-exchange/                         @ledgerhq/ptx
 
 # Wallet API team
 **/PlatformAppProviderWrapper.tsx                        @ledgerhq/wallet-api

diff --git a/apps/cli/src/commands/appUninstallAll.ts b/apps/cli/src/commands/appUninstallAll.ts
@@ -4,7 +4,10 @@ import { mergeMap, filter, map } from "rxjs/operators";
 import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
 import getDeviceInfo from "@ledgerhq/live-common/hw/getDeviceInfo";
 import { reducer, runAll } from "@ledgerhq/live-common/apps/index";
-import { listApps, execWithTransport } from "@ledgerhq/live-common/apps/hw";
+import {
+  listAppsUseCase,
+  execWithTransport,
+} from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import { command as uninstallAllApps } from "@ledgerhq/live-common/hw/uninstallAllApps";
 import { deviceOpt } from "../scan";
 
@@ -25,7 +28,7 @@ export default {
           } else {
             return from(getDeviceInfo(t)).pipe(
               mergeMap(deviceInfo =>
-                listApps(t, deviceInfo).pipe(
+                listAppsUseCase(t, deviceInfo).pipe(
                   filter(e => e.type === "result"),
                   map((e: any) =>
                     reducer(e.result, {

diff --git a/apps/cli/src/commands/appsCheckAllAppVersions.ts b/apps/cli/src/commands/appsCheckAllAppVersions.ts
@@ -10,7 +10,10 @@ import network from "@ledgerhq/live-network/network";
 import installApp from "@ledgerhq/live-common/hw/installApp";
 import uninstallApp from "@ledgerhq/live-common/hw/uninstallApp";
 import { initState, reducer, runAll } from "@ledgerhq/live-common/apps/index";
-import { listApps, execWithTransport } from "@ledgerhq/live-common/apps/hw";
+import {
+  listAppsUseCase,
+  execWithTransport,
+} from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import { delay } from "@ledgerhq/live-common/promise";
 import { getEnv } from "@ledgerhq/live-env";
 import { getDependencies } from "@ledgerhq/live-common/apps/polyfill";
@@ -274,7 +277,7 @@ const checkInstalled = (installed, candidate: Candidate) => {
 };
 
 const wipeAll = (t, deviceInfo) =>
-  listApps(t, deviceInfo).pipe(
+  listAppsUseCase(t, deviceInfo).pipe(
     filter(e => e.type === "result"),
     map((e: any) => e.result),
     mergeMap(listAppsResult => {

diff --git a/apps/cli/src/commands/appsInstallAll.ts b/apps/cli/src/commands/appsInstallAll.ts
@@ -4,7 +4,10 @@ import { mergeMap, filter, map } from "rxjs/operators";
 import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
 import getDeviceInfo from "@ledgerhq/live-common/hw/getDeviceInfo";
 import { initState, reducer, runAll } from "@ledgerhq/live-common/apps/index";
-import { listApps, execWithTransport } from "@ledgerhq/live-common/apps/hw";
+import {
+  listAppsUseCase,
+  execWithTransport,
+} from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import { deviceOpt } from "../scan";
 export default {
   description: "test script to install and uninstall all apps",
@@ -18,7 +21,7 @@ export default {
       const exec = execWithTransport(t);
       return from(getDeviceInfo(t)).pipe(
         mergeMap(deviceInfo =>
-          listApps(t, deviceInfo).pipe(
+          listAppsUseCase(t, deviceInfo).pipe(
             filter(e => e.type === "result"),
             map((e: any) =>
               e.result.appsListNames.reduce(

diff --git a/apps/cli/src/commands/appsUpdateTestAll.ts b/apps/cli/src/commands/appsUpdateTestAll.ts
@@ -4,7 +4,10 @@ import { mergeMap, ignoreElements, filter, map } from "rxjs/operators";
 import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
 import getDeviceInfo from "@ledgerhq/live-common/hw/getDeviceInfo";
 import { initState, reducer, runAll, getActionPlan } from "@ledgerhq/live-common/apps/index";
-import { listApps, execWithTransport } from "@ledgerhq/live-common/apps/hw";
+import {
+  listAppsUseCase,
+  execWithTransport,
+} from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import type { AppOp } from "@ledgerhq/live-common/apps/types";
 import { deviceOpt } from "../scan";
 
@@ -34,7 +37,7 @@ export default {
         // FIXME: mergeMap deprecated, using map inside pipe should do the work
         map(
           deviceInfo =>
-            listApps(t, deviceInfo).pipe(
+            listAppsUseCase(t, deviceInfo).pipe(
               filter(e => e.type === "result"),
               map((e: any) => e.result),
               mergeMap(listAppsResult => {
@@ -82,7 +85,7 @@ export default {
                         new Observable(o => {
                           let sub;
                           const timeout = setTimeout(() => {
-                            sub = listApps(t, deviceInfo).subscribe(o);
+                            sub = listAppsUseCase(t, deviceInfo).subscribe(o);
                           }, 4000);
                           return () => {
                             clearTimeout(timeout);

diff --git a/apps/cli/src/commands/devDeviceAppsScenario.ts b/apps/cli/src/commands/devDeviceAppsScenario.ts
@@ -4,7 +4,10 @@ import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
 import getDeviceInfo from "@ledgerhq/live-common/hw/getDeviceInfo";
 import { initState, ListAppsResult, reducer, runAll } from "@ledgerhq/live-common/apps/index";
 import ManagerAPI from "@ledgerhq/live-common/manager/api";
-import { listApps, execWithTransport } from "@ledgerhq/live-common/apps/hw";
+import {
+  listAppsUseCase,
+  execWithTransport,
+} from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import installApp from "@ledgerhq/live-common/hw/installApp";
 import { deviceOpt } from "../scan";
 import { Application } from "@ledgerhq/types-live";
@@ -64,7 +67,7 @@ export default {
       // $FlowFixMe
       return from(getDeviceInfo(t)).pipe(
         mergeMap(deviceInfo =>
-          listApps(t, deviceInfo).pipe(
+          listAppsUseCase(t, deviceInfo).pipe(
             filter<any>(e => e.type === "result"),
             map<{ type: "result"; result: ListAppsResult }, ListAppsResult>(e => e.result),
             mergeMap<ListAppsResult, Observable<Application[]>>(listAppsResult => {

diff --git a/apps/cli/src/commands/managerListApps.ts b/apps/cli/src/commands/managerListApps.ts
@@ -2,7 +2,10 @@ import { from } from "rxjs";
 import { filter, map, mergeMap, repeat } from "rxjs/operators";
 import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
 import getDeviceInfo from "@ledgerhq/live-common/hw/getDeviceInfo";
-import { enableListAppsV2, listApps } from "@ledgerhq/live-common/apps/hw";
+import {
+  enableListAppsV2,
+  listAppsUseCase,
+} from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import { deviceOpt } from "../scan";
 export default {
   description: "List apps that can be installed on the device",
@@ -44,7 +47,7 @@ export default {
     return withDevice(device || "")(t =>
       from(getDeviceInfo(t)).pipe(
         mergeMap(deviceInfo =>
-          listApps(t, deviceInfo).pipe(
+          listAppsUseCase(t, deviceInfo).pipe(
             filter(e => e.type === "result"),
             // @ts-expect-error we need better typings and safe guard to infer types
             map(e => e.result),

diff --git a/apps/ledger-live-desktop/src/config/urls.ts b/apps/ledger-live-desktop/src/config/urls.ts
@@ -165,6 +165,11 @@ export const urls = {
         tos: "https://criptointercambio.com/terms-of-use",
         support: "https://criptointercambio.com/en/about",
       },
+      moonpay: {
+        main: "https://www.moonpay.com/",
+        tos: "https://www.moonpay.com/legal/terms_of_use",
+        support: "https://support.moonpay.com",
+      },
     },
   },
   exchange: {

diff --git a/apps/ledger-live-desktop/src/renderer/Default.tsx b/apps/ledger-live-desktop/src/renderer/Default.tsx
@@ -40,7 +40,7 @@ import VaultSignerBanner from "~/renderer/components/VaultSignerBanner";
 import { hasCompletedOnboardingSelector } from "~/renderer/reducers/settings";
 import { updateIdentify } from "./analytics/segment";
 import { useFeature, FeatureToggle } from "@ledgerhq/live-common/featureFlags/index";
-import { enableListAppsV2 } from "@ledgerhq/live-common/apps/hw";
+import { enableListAppsV2 } from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import {
   useFetchCurrencyAll,
   useFetchCurrencyFrom,

diff --git a/apps/ledger-live-desktop/src/renderer/analytics/segment.ts b/apps/ledger-live-desktop/src/renderer/analytics/segment.ts
@@ -62,13 +62,16 @@ const getFeatureFlagProperties = () => {
     const analytics = getAnalytics();
     const ptxEarnFeatureFlag = analyticsFeatureFlagMethod("ptxEarn");
     const fetchAdditionalCoins = analyticsFeatureFlagMethod("fetchAdditionalCoins");
+    const stakingProviders = analyticsFeatureFlagMethod("ethStakingProviders");
 
     const isBatch1Enabled =
       !!fetchAdditionalCoins?.enabled && fetchAdditionalCoins?.params?.batch === 1;
     const isBatch2Enabled =
       !!fetchAdditionalCoins?.enabled && fetchAdditionalCoins?.params?.batch === 2;
     const isBatch3Enabled =
       !!fetchAdditionalCoins?.enabled && fetchAdditionalCoins?.params?.batch === 3;
+    const stakingProvidersEnabled =
+      stakingProviders?.enabled && stakingProviders?.params?.listProvider.length;
 
     analytics.identify(
       id,
@@ -77,6 +80,7 @@ const getFeatureFlagProperties = () => {
         isBatch1Enabled,
         isBatch2Enabled,
         isBatch3Enabled,
+        stakingProvidersEnabled,
       },
       {
         context: getContext(),
@@ -95,6 +99,9 @@ const extraProperties = (store: ReduxStore) => {
   const device = lastSeenDeviceSelector(state);
   const devices = devicesModelListSelector(state);
   const accounts = accountsSelector(state);
+  const stakingProviders =
+    analyticsFeatureFlagMethod &&
+    analyticsFeatureFlagMethod("ethStakingProviders")?.params?.listProvider;
 
   const deviceInfo = device
     ? {
@@ -145,6 +152,7 @@ const extraProperties = (store: ReduxStore) => {
     hasGenesisPass,
     hasInfinityPass,
     modelIdList: devices,
+    stakingProvidersEnabled: stakingProviders?.length || "flag not loaded",
     ...deviceInfo,
   };
 };

diff --git a/apps/ledger-live-desktop/src/renderer/families/evm/StakeFlowModal/index.tsx b/apps/ledger-live-desktop/src/renderer/families/evm/StakeFlowModal/index.tsx
@@ -16,6 +16,7 @@ type Props = {
 
 const StakingModal = ({ account, hasCheckbox, singleProviderRedirectMode, source }: Props) => {
   const ethStakingProviders = useFeature("ethStakingProviders");
+  const providers = ethStakingProviders?.params?.listProvider;
 
   if (!ethStakingProviders?.enabled) {
     return null;
@@ -39,7 +40,7 @@ const StakingModal = ({ account, hasCheckbox, singleProviderRedirectMode, source
                 hasCheckbox={hasCheckbox}
                 singleProviderRedirectMode={singleProviderRedirectMode}
                 source={source}
-                listProviders={ethStakingProviders.params?.listProvider}
+                listProviders={providers}
               />
             </Flex>
           )}

diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/DrawerFooter.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/DrawerFooter.tsx
@@ -18,8 +18,9 @@ const Terms = styled(Text).attrs({
 `;
 
 export function DrawerFooter({ provider }: { provider: string }) {
-  const swapProvider = urls.swap.providers[provider as keyof typeof urls.swap.providers];
-  const url = ("tos" in swapProvider && swapProvider?.tos) || undefined;
+  const swapProvider =
+    urls.swap.providers?.[provider as keyof typeof urls.swap.providers] ?? undefined;
+  const url = (swapProvider && "tos" in swapProvider && swapProvider?.tos) || undefined;
   const onLinkClick = useCallback(() => openURL(url!), [url]);
   if (!url) {
     return null;

diff --git a/apps/ledger-live-desktop/src/renderer/screens/manager/Dashboard.tsx b/apps/ledger-live-desktop/src/renderer/screens/manager/Dashboard.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useState, useEffect, useRef, useContext } from "react";
 import { useSelector } from "react-redux";
 import { withDevice } from "@ledgerhq/live-common/hw/deviceAccess";
-import { execWithTransport } from "@ledgerhq/live-common/apps/hw";
+import { execWithTransport } from "@ledgerhq/live-common/device/use-cases/listAppsUseCase";
 import { App, DeviceInfo, FirmwareUpdateContext } from "@ledgerhq/types-live";
 import { AppOp, ListAppsResult } from "@ledgerhq/live-common/apps/types";
 import { distribute, initState } from "@ledgerhq/live-common/apps/logic";

diff --git a/apps/ledger-live-mobile/.unimportedrc.json b/apps/ledger-live-mobile/.unimportedrc.json
@@ -1,17 +1,7 @@
 {
-  "entry": [
-    "index.js"
-  ],
-  "extensions": [
-    ".ts",
-    ".js",
-    ".jsx",
-    ".tsx",
-    ".d.ts"
-  ],
-  "ignorePatterns": [
-    "**/node_modules/**"
-  ],
+  "entry": ["index.js"],
+  "extensions": [".ts", ".js", ".jsx", ".tsx", ".d.ts"],
+  "ignorePatterns": ["**/node_modules/**"],
   "ignoreUnresolved": [],
   "ignoreUnimported": [
     "**/*.test.*",
@@ -24,7 +14,8 @@
     "src/**/*.ios.*",
     "src/components/RootNavigator/types.ts",
     "src/logic/keyboardVisible.ts",
-    "src/contentCards/cards/vertical/*"
+    "src/contentCards/cards/vertical/*",
+    "src/**/__integrations__/*.tsx"
   ],
   "ignoreUnused": [
     "@ledgerhq/react-native-passcode-auth",
@@ -46,4 +37,4 @@
     "react-native-tcp-socket",
     "react-native-udp"
   ]
-}
+}
diff --git a/apps/ledger-live-mobile/__tests__/test-renderer.tsx b/apps/ledger-live-mobile/__tests__/test-renderer.tsx
@@ -4,7 +4,6 @@ import { I18nextProvider } from "react-i18next";
 import { Provider } from "react-redux";
 import { NavigationContainer } from "@react-navigation/native";
 import { AnalyticsContextProvider } from "~/analytics/AnalyticsContext";
-import NotificationsProvider from "~/screens/NotificationCenter/NotificationsProvider";
 import { FirebaseFeatureFlagsProvider } from "~/components/FirebaseFeatureFlags";
 import { getFeature } from "./featureFlags";
 import { i18n } from "~/context/Locale";
@@ -35,7 +34,11 @@ const customRender = (
       getDefaultMiddleware({ serializableCheck: false, immutableCheck: false }),
     preloadedState: {
       ...initialState,
-      settings: { ...SETTINGS_INITIAL_STATE, overriddenFeatureFlags: featureFlags },
+      settings: {
+        ...SETTINGS_INITIAL_STATE,
+        ...(initialState.settings || {}),
+        overriddenFeatureFlags: featureFlags,
+      },
     },
     devTools: false,
   });
@@ -47,9 +50,7 @@ const customRender = (
           <FirebaseFeatureFlagsProvider getFeature={getFeature}>
             <AnalyticsContextProvider>
               <I18nextProvider i18n={i18n}>
-                <NotificationsProvider>
-                  <NavigationContainer>{children}</NavigationContainer>
-                </NotificationsProvider>
+                <NavigationContainer>{children}</NavigationContainer>
               </I18nextProvider>
             </AnalyticsContextProvider>
           </FirebaseFeatureFlagsProvider>
@@ -64,6 +65,8 @@ const customRender = (
   };
 };
 
+export const LONG_TIMEOUT = 30000;
+
 // re-export everything
 export * from "@testing-library/react-native";