@ledgerhq/live-common 34.35.0-nightly.3 → 34.35.0-nightly.5

package/src/notifications/AnnouncementProvider/index.tsx

@@ -1,5 +1,6 @@
 import React, { createContext, useMemo, useCallback, useContext, ReactElement } from "react";
 import differenceBy from "lodash/differenceBy";
+import { fromPromise } from "xstate";
 import { useMachine } from "@xstate/react";
 import type { Announcement, AnnouncementsUserSettings, State, AnnouncementsApi } from "./types";
 import { localizeAnnouncements, filterAnnouncements } from "./logic";
@@ -55,7 +56,8 @@ export const AnnouncementProvider = ({
   fetchApi = defaultFetchApi,
 }: Props): ReactElement => {
   const fetchData = useCallback(
-    async ({ allIds, cache }) => {
+    async (arg0: { input: { allIds: string[]; cache: Record<string, Announcement> } }) => {
+      const { allIds, cache } = arg0.input;
       const rawAnnouncements = await fetchApi.fetchAnnouncements();
       const localizedAnnouncements = localizeAnnouncements(rawAnnouncements, context);
       const announcements = filterAnnouncements(localizedAnnouncements, context);
@@ -80,9 +82,9 @@ export const AnnouncementProvider = ({
     [context, onNewAnnouncement, fetchApi],
   );
   const emitNewAnnouncement = useCallback(
-    ({ cache }, { seenId }) => {
+    ({ context }) => {
       if (onAnnouncementRead) {
-        onAnnouncementRead(cache[seenId]);
+        onAnnouncementRead(context.cache[context.seenId]);
       }
     },
     [onAnnouncementRead],
@@ -96,7 +98,7 @@ export const AnnouncementProvider = ({
     };
   }, [handleLoad]);
   const saveData = useCallback(
-    context => {
+    ({ context }) => {
       const { cache, lastUpdateTime, seenIds, allIds } = context;
       const announcements = allIds.map((id: string) => cache[id]);
       handleSave({
@@ -107,19 +109,21 @@ export const AnnouncementProvider = ({
     },
     [handleSave],
   );
-  const [state, send] = useMachine(announcementMachine as unknown as any, {
-    actions: {
-      saveData,
-      emitNewAnnouncement: emitNewAnnouncement as any,
-    },
-    services: {
-      loadData,
-      fetchData,
-    },
-    delays: {
-      AUTO_UPDATE_DELAY: autoUpdateDelay,
-    },
-  });
+  const [state, send] = useMachine(
+    announcementMachine.provide({
+      actions: {
+        saveData,
+        emitNewAnnouncement,
+      },
+      actors: {
+        loadData: fromPromise(loadData),
+        fetchData: fromPromise(fetchData),
+      },
+      delays: {
+        AUTO_UPDATE_DELAY: autoUpdateDelay,
+      },
+    }),
+  );
   const api = useMemo(
     () => ({
       updateCache: async () => {

package/src/notifications/AnnouncementProvider/machine.ts

@@ -20,8 +20,8 @@ export const announcementMachine = createMachine(
           src: "loadData",
           onDone: {
             target: "updating",
-            actions: assign((_, { data }) => {
-              const { announcements, seenIds, lastUpdateTime } = data;
+            actions: assign(({ event }) => {
+              const { announcements, seenIds, lastUpdateTime } = event.output;
               const cache = {};
               announcements.forEach(announcement => {
                 cache[announcement.uuid] = announcement;
@@ -56,11 +56,12 @@ export const announcementMachine = createMachine(
       updating: {
         invoke: {
           src: "fetchData",
+          input: ({ context }) => ({ allIds: context.allIds, cache: context.cache }),
           onDone: {
             target: "idle",
             actions: [
-              assign((context: any, { data }: any) => {
-                const { announcements, updateTime } = data;
+              assign(({ context, event }) => {
+                const { announcements, updateTime } = event.output;
                 const cache = {};
                 announcements.forEach(announcement => {
                   cache[announcement.uuid] = announcement;
@@ -80,8 +81,8 @@ export const announcementMachine = createMachine(
           },
           onError: {
             target: "idle",
-            actions: assign((_, { data }) => ({
-              error: data,
+            actions: assign(({ event }) => ({
+              error: event.error as Error,
             })),
           },
         },
@@ -89,14 +90,14 @@ export const announcementMachine = createMachine(
     },
     on: {
       SET_AS_SEEN: {
-        cond: (context: any, event: any) => !context.seenIds.includes(event.seenId),
+        guard: ({ context, event }) => !context.seenIds.includes(event.seenId),
         actions: ["setAsSeen", "saveData", "emitNewAnnouncement"],
       },
     },
   },
   {
     actions: {
-      setAsSeen: assign((context: any, event: any) => ({
+      setAsSeen: assign(({ context, event }) => ({
         seenIds: [...context.seenIds, event.seenId],
       })),
     },

package/src/notifications/ServiceStatusProvider/index.tsx

@@ -1,6 +1,7 @@
 import React, { createContext, useContext, useMemo, useCallback, ReactElement } from "react";
 import type { State, ServiceStatusUserSettings, Incident, ServiceStatusApi } from "./types";
 import defaultNetworkApi from "./api";
+import { fromPromise } from "xstate";
 import { useMachine } from "@xstate/react";
 import { serviceStatusMachine } from "./machine";
 type Props = {
@@ -74,14 +75,16 @@ export const ServiceStatusProvider = ({
     };
   }, [networkApi]);
 
-  const [state, send] = useMachine(serviceStatusMachine, {
-    services: {
-      fetchData,
-    },
-    delays: {
-      AUTO_UPDATE_DELAY: autoUpdateDelay,
-    },
-  });
+  const [state, send] = useMachine(
+    serviceStatusMachine.provide({
+      actors: {
+        fetchData: fromPromise(fetchData),
+      },
+      delays: {
+        AUTO_UPDATE_DELAY: autoUpdateDelay,
+      },
+    }),
+  );
   const api = useMemo(
     () => ({
       updateData: async () => {

package/src/notifications/ServiceStatusProvider/machine.ts

@@ -33,8 +33,8 @@ export const serviceStatusMachine = createMachine({
         src: "fetchData",
         onDone: {
           target: "idle",
-          actions: assign((_context: any, { data }: any) => {
-            const { incidents, updateTime } = data;
+          actions: assign(({ event }) => {
+            const { incidents, updateTime } = event.output;
             return {
               incidents,
               lastUpdateTime: updateTime,
@@ -45,8 +45,8 @@ export const serviceStatusMachine = createMachine({
         },
         onError: {
           target: "idle",
-          actions: assign((_: any, { data }: any) => ({
-            error: data,
+          actions: assign(({ event }) => ({
+            error: event.error as Error,
           })),
         },
       },

package/src/wallet-api/ModularDrawer/types.ts

@@ -0,0 +1,45 @@
+import { z } from "zod";
+
+export type ModularDrawerConfiguration = {
+  assets?: {
+    filter?: string;
+    leftElement?: string;
+    rightElement?: string;
+  };
+  networks?: {
+    rightElement?: string;
+    leftElement?: string;
+  };
+};
+
+const filterOptions = ["topNetworks"] as const;
+const assetsLeftElementOptions = ["apy", "priceVariation"] as const;
+const assetsRightElementOptions = ["balance", "marketTrend"] as const;
+const networksLeftElementOptions = ["numberOfAccounts", "numberOfAccountsAndApy"] as const;
+const networksRightElementOptions = ["balance"] as const;
+
+export const EnhancedModularDrawerConfigurationSchema = z.object({
+  assets: z
+    .object({
+      filter: z.enum(filterOptions).optional(),
+      leftElement: z.enum(assetsLeftElementOptions).optional(),
+      rightElement: z.enum(assetsRightElementOptions).optional(),
+    })
+    .optional(),
+  networks: z
+    .object({
+      leftElement: z.enum(networksLeftElementOptions).optional(),
+      rightElement: z.enum(networksRightElementOptions).optional(),
+    })
+    .optional(),
+});
+
+/**
+ * Enhanced configuration for the modular drawer.
+ * Extends the base configuration by allowing customization of `assets` and `networks` properties.
+ */
+export type EnhancedModularDrawerConfiguration = Omit<
+  ModularDrawerConfiguration,
+  "assets" | "networks"
+> &
+  z.infer<typeof EnhancedModularDrawerConfigurationSchema>;

package/src/wallet-api/ModularDrawer/utils.ts

@@ -0,0 +1,37 @@
+import {
+  type EnhancedModularDrawerConfiguration,
+  type ModularDrawerConfiguration,
+  EnhancedModularDrawerConfigurationSchema,
+} from "./types";
+
+export const defaultDrawerConfiguration: EnhancedModularDrawerConfiguration = {
+  assets: {
+    rightElement: "balance",
+  },
+  networks: {
+    leftElement: "numberOfAccounts",
+  },
+};
+
+export function validateAndTransformConfigurationWithZod(
+  config?: ModularDrawerConfiguration | EnhancedModularDrawerConfiguration,
+): EnhancedModularDrawerConfiguration {
+  const result = EnhancedModularDrawerConfigurationSchema.safeParse(config);
+
+  if (!result.success) {
+    console.warn("Modulare Drawer invalid configuration received:", result.error);
+    return {};
+  }
+
+  return result.data;
+}
+
+export function createModularDrawerConfiguration(
+  config?: ModularDrawerConfiguration | EnhancedModularDrawerConfiguration,
+): EnhancedModularDrawerConfiguration {
+  const validatedConfig = validateAndTransformConfigurationWithZod(config);
+  return {
+    ...defaultDrawerConfiguration,
+    ...validatedConfig,
+  } satisfies EnhancedModularDrawerConfiguration;
+}

package/src/wallet-api/react.ts

@@ -52,6 +52,7 @@ import {
 import { DiscoverDB } from "./types";
 import { LiveAppManifest } from "../platform/types";
 import { WalletState } from "@ledgerhq/live-wallet/store";
+import { ModularDrawerConfiguration } from "./ModularDrawer/types";
 
 export function safeGetRefValue<T>(ref: RefObject<T>): NonNullable<T> {
   if (!ref.current) {
@@ -129,6 +130,7 @@ export interface UiHook {
   "account.request": (params: {
     accounts$?: Observable<WalletAPIAccount[]>;
     currencies: CryptoOrTokenCurrency[];
+    drawerConfiguration?: ModularDrawerConfiguration;
     onSuccess: (account: AccountLike, parentAccount: Account | undefined) => void;
     onCancel: () => void;
   }) => void;
@@ -354,39 +356,43 @@ export function useWalletAPIServer({
   useEffect(() => {
     if (!uiAccountRequest) return;
 
-    server.setHandler("account.request", async ({ accounts$, currencies$ }) => {
-      tracking.requestAccountRequested(manifest);
-      const currencies = await firstValueFrom(currencies$);
+    server.setHandler(
+      "account.request",
+      async ({ accounts$, currencies$, drawerConfiguration }) => {
+        tracking.requestAccountRequested(manifest);
+        const currencies = await firstValueFrom(currencies$);
+
+        return new Promise((resolve, reject) => {
+          // handle no curencies selected case
+          const currencyList = currencies.reduce<CryptoOrTokenCurrency[]>((prev, { id }) => {
+            const currency = findCryptoCurrencyById(id) || findTokenById(id);
+            if (currency) {
+              prev.push(currency);
+            }
+            return prev;
+          }, []);
 
-      return new Promise((resolve, reject) => {
-        // handle no curencies selected case
-        const currencyList = currencies.reduce<CryptoOrTokenCurrency[]>((prev, { id }) => {
-          const currency = findCryptoCurrencyById(id) || findTokenById(id);
-          if (currency) {
-            prev.push(currency);
-          }
-          return prev;
-        }, []);
-
-        let done = false;
-        uiAccountRequest({
-          accounts$,
-          currencies: currencyList,
-          onSuccess: (account: AccountLike, parentAccount: Account | undefined) => {
-            if (done) return;
-            done = true;
-            tracking.requestAccountSuccess(manifest);
-            resolve(accountToWalletAPIAccount(walletState, account, parentAccount));
-          },
-          onCancel: () => {
-            if (done) return;
-            done = true;
-            tracking.requestAccountFail(manifest);
-            reject(new Error("Canceled by user"));
-          },
+          let done = false;
+          uiAccountRequest({
+            accounts$,
+            currencies: currencyList,
+            drawerConfiguration,
+            onSuccess: (account: AccountLike, parentAccount: Account | undefined) => {
+              if (done) return;
+              done = true;
+              tracking.requestAccountSuccess(manifest);
+              resolve(accountToWalletAPIAccount(walletState, account, parentAccount));
+            },
+            onCancel: () => {
+              if (done) return;
+              done = true;
+              tracking.requestAccountFail(manifest);
+              reject(new Error("Canceled by user"));
+            },
+          });
         });
-      });
-    });
+      },
+    );
   }, [walletState, manifest, server, tracking, uiAccountRequest]);
 
   useEffect(() => {

package/lib/index.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/lib/index.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/lib-es/index.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=index.d.ts.map

package/lib-es/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/lib-es/index.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=index.js.map

package/lib-es/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}