feat(contacts): drive add-address confirmation via DiE

Author: claudiiafg

.changeset/calm-contacts-confirm.md

@@ -0,0 +1,8 @@
+---
+"ledger-live-desktop": minor
+"live-mobile": minor
+"@features/flow-contacts-add-address": minor
+"@features/platform-contacts": patch
+---
+
+Drive Contacts add-address confirmation through the Device Intent Executor instead of mocked Continue screens, including prefill and Send entry points.

apps/ledger-live-desktop/__mocks__/@features/platform-contacts/device.ts

@@ -1,4 +1,4 @@
-import { createMockContactDeviceIntentsPort } from "@features/platform-contacts";
+import { createMockContactDeviceIntentsPort } from "@features/platform-contacts/test";
 
 const deviceIntents = createMockContactDeviceIntentsPort();
 

apps/ledger-live-desktop/src/mvvm/features/Contacts/__integrations__/Contacts.deviceIntents.integration.test.tsx

@@ -117,10 +117,9 @@ describe("Contacts device intents integration", () => {
       expect(screen.getByTestId("contacts-add-address-confirm")).toBeEnabled();
     });
     await user.click(screen.getByTestId("contacts-add-address-confirm"));
-    await user.click(screen.getByTestId("contacts-add-address-review-continue"));
 
     await expectDeviceIntentExecutor();
-    expect(screen.queryByTestId("contacts-add-address-review")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("contacts-add-address-confirm")).not.toBeInTheDocument();
   });
 
   it("should open the device intent executor alone when renaming a contact", async () => {

apps/ledger-live-desktop/src/mvvm/features/Contacts/__integrations__/Contacts.integration.test.tsx

@@ -577,24 +577,8 @@ describe("Contacts integration", () => {
     await user.type(addressNameInput, "Exchange");
     await user.click(confirmationButton);
 
-    expect(screen.getByRole("dialog")).toBe(dialog);
-    expect(screen.getByTestId("contacts-add-address-review")).toBeVisible();
-
-    await user.click(screen.getByRole("button", { name: "Go back" }));
-    expect(screen.getByTestId("contacts-add-address-input")).toBeVisible();
-    expect(screen.getByTestId("contacts-add-address-name-input")).toHaveValue("Exchange");
-
-    await user.click(screen.getByTestId("contacts-add-address-confirm"));
-    await user.click(screen.getByTestId("contacts-add-address-review-continue"));
-
-    await waitFor(() => {
-      expect(screen.getByTestId("contacts-add-address-success")).toBeVisible();
-    });
-
-    await user.click(screen.getByTestId("contacts-add-address-success-continue"));
-
     await waitFor(() => {
-      expect(screen.queryByTestId("contacts-add-address-success")).not.toBeInTheDocument();
+      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
       expect(
         within(screen.getByTestId("contacts-detail-screen")).getByText("1 address"),
       ).toBeVisible();

apps/ledger-live-desktop/src/mvvm/features/Contacts/hooks/prefillAddAddress/PrefillAddAddressFlowRoot.tsx

@@ -8,19 +8,24 @@ import {
 import {
   isPrefillAddAddressFlowOpen,
   usePrefillAddAddressFlow,
-  type AddAddressCompletionLabels,
   type ContactsAddAddressNameLabels,
   type ContactsAddAddressReviewLabels,
 } from "@features/flow-contacts-add-address";
-import { createMockContactDeviceIntentsPort } from "@features/platform-contacts";
+import { getMinVersion } from "@ledgerhq/live-common/apps/support";
+import { useContactsIntentsOrchestrator } from "@features/platform-contacts/device";
+import { DeviceIntentExecutorLWD } from "LLD/components/DeviceIntentExecutor";
+import { contactsIntentLWDDefinitions } from "../../deviceIntents/contactsIntentPlatformDefinitions";
 import { ContactsAddAddressFlowDialog } from "../../screens/Contacts/components/ContactsAddAddressFlowDialog";
 import type { ContactsAddAddressFlowDialogProps } from "../../screens/Contacts/components/ContactsAddAddressFlowDialog/types";
 import { useContactsAddressValidationAdapter } from "../useContactsAddressValidationAdapter";
 
 export function PrefillAddAddressFlowRoot(): React.JSX.Element | null {
   const { t } = useTranslation();
   const addressValidation = useContactsAddressValidationAdapter();
-  const deviceIntents = useMemo(() => createMockContactDeviceIntentsPort(), []);
+  const { deviceIntents, dieProps } = useContactsIntentsOrchestrator({
+    intents: contactsIntentLWDDefinitions,
+    getLiveConfigMinVersion: getMinVersion,
+  });
   const { state, updateAddressLabel, continueFromName, onBack, onClose, saveFromReview } =
     usePrefillAddAddressFlow({ addressValidation, deviceIntents });
 
@@ -52,15 +57,9 @@ export function PrefillAddAddressFlowRoot(): React.JSX.Element | null {
     }),
     [t],
   );
-  const completionLabels = useMemo<AddAddressCompletionLabels>(
-    () => ({
-      title: t("contacts.addAddressReview.title"),
-      continue: t("contacts.addAddressReview.continue"),
-      successTitle: t("contacts.addAddressReview.successTitle"),
-      close: t("contacts.addAddressReview.close"),
-    }),
-    [t],
-  );
+  if (dieProps?.enabled === true) {
+    return <DeviceIntentExecutorLWD sourceFlow="contacts" {...dieProps} />;
+  }
 
   if (!isPrefillAddAddressFlowOpen(state)) {
     return null;
@@ -87,15 +86,13 @@ export function PrefillAddAddressFlowRoot(): React.JSX.Element | null {
     },
     nameLabels,
     reviewLabels,
-    completionLabels,
     onAddressChange: () => undefined,
     onContinueFromAddressDetails: () => undefined,
     onAddressLabelChange: updateAddressLabel,
     onContinueFromName: continueFromName,
     onContinueFromReview: () => {
       void saveFromReview();
     },
-    onCompleteMockConfirmation: () => undefined,
     onBack,
     onClose,
   };

apps/ledger-live-desktop/src/mvvm/features/Contacts/screens/Contacts/components/ContactsAddAddressFlowDialog/ContactsAddAddressFlowDialog.tsx

@@ -15,13 +15,11 @@ export function ContactsAddAddressFlowDialog({
   sanctionedAddressBanner,
   nameLabels,
   reviewLabels,
-  completionLabels,
   onAddressChange,
   onContinueFromAddressDetails,
   onAddressLabelChange,
   onContinueFromName,
   onContinueFromReview,
-  onCompleteMockConfirmation,
   onBack,
   onClose,
 }: ContactsAddAddressFlowDialogProps): React.JSX.Element | null {
@@ -40,18 +38,15 @@ export function ContactsAddAddressFlowDialog({
             modularDialog.content
           ) : (
             <ContactsAddAddressFlowContent
-              completionLabels={completionLabels}
               entryLabels={entryLabels}
               sanctionedAddressBanner={sanctionedAddressBanner}
               nameLabels={nameLabels}
               reviewLabels={reviewLabels}
               onAddressChange={onAddressChange}
               onAddressLabelChange={onAddressLabelChange}
-              onClose={onClose}
               onContinueFromAddressDetails={onContinueFromAddressDetails}
               onContinueFromName={onContinueFromName}
               onContinueFromReview={onContinueFromReview}
-              onCompleteMockConfirmation={onCompleteMockConfirmation}
               state={state}
             />
           );

apps/ledger-live-desktop/src/mvvm/features/Contacts/screens/Contacts/components/ContactsAddAddressFlowDialog/types.ts

@@ -1,5 +1,4 @@
 import type {
-  AddAddressCompletionLabels,
   AddAddressEntryLabels,
   AddAddressFlowState,
   AddAddressInputSource,
@@ -14,13 +13,11 @@ export type ContactsAddAddressFlowDialogProps = Readonly<{
   sanctionedAddressBanner: SanctionedAddressBannerProps;
   nameLabels: ContactsAddAddressNameLabels;
   reviewLabels: ContactsAddAddressReviewLabels;
-  completionLabels: AddAddressCompletionLabels;
   onAddressChange: (address: string, inputMethod: AddAddressInputSource) => void;
   onContinueFromAddressDetails: () => void;
   onAddressLabelChange: (value: string) => void;
   onContinueFromName: () => void;
   onContinueFromReview: () => void;
-  onCompleteMockConfirmation: () => void;
   onBack: () => void;
   onClose: () => void;
 }>;