chore: review fixes

Author: ishaba

apps/ledger-live-desktop/src/mvvm/features/AddAccountDrawer/screens/ScanAccounts/useScanAccounts.ts

@@ -8,7 +8,6 @@ import { useDispatch, useSelector } from "LLD/hooks/redux";
 import { Subscription } from "rxjs";
 import { openModal } from "~/renderer/actions/modals";
 import { setDrawer } from "~/renderer/drawers/Provider";
-import { getCurrentDevice } from "~/renderer/reducers/devices";
 import * as RX from "rxjs/operators";
 import { getLLDCoinFamily } from "~/renderer/families";
 import { accountsSelector } from "~/renderer/reducers/accounts";
@@ -55,7 +54,6 @@ export function useScanAccounts({
 }: UseScanAccountsProps) {
   const { trackAddAccountEvent } = useAddAccountAnalytics();
   const existingAccounts = useSelector(accountsSelector);
-  const device = useSelector(getCurrentDevice);
   const blacklistedTokenIds = useSelector(blacklistedTokenIdsSelector);
   const [error, setError] = useState(null);
   const dispatch = useDispatch();
@@ -188,9 +186,7 @@ export function useScanAccounts({
       dispatch(
         openModal("MODAL_CANTON_ONBOARD_ACCOUNT", {
           currency,
-          device,
           selectedAccounts: selectedCantonCreatableAccounts,
-          existingAccounts: existingAccounts,
           editedNames: {},
         }),
       );
@@ -235,7 +231,6 @@ export function useScanAccounts({
     existingAccounts,
     onComplete,
     currency,
-    device,
     hasCantonCreatableAccounts,
     selectedCantonCreatableAccounts,
     hasConcordiumCreatableAccounts,

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/__tests__/accountPreparation.test.ts

@@ -135,7 +135,6 @@ describe("accountPreparation", () => {
 
       const result = prepareAccountsForAdding({
         selectedAccounts: [accountToReonboard],
-        existingAccounts: [],
         editedNames: {},
         isReonboarding: true,
         accountToReonboard,
@@ -153,7 +152,6 @@ describe("accountPreparation", () => {
 
       const result = prepareAccountsForAdding({
         selectedAccounts: [used, unused],
-        existingAccounts: [],
         editedNames: {},
         onboardingResult: { completedAccount: completed },
       });

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/__tests__/useCantonBridge.test.ts

@@ -67,6 +67,26 @@ describe("useCantonBridge", () => {
       expect(mockBridge.onboardAccount).not.toHaveBeenCalled();
     });
 
+    it("should not start onboarding if bridge is null", () => {
+      const { result } = renderHook(() => useCantonBridge({ ...defaultParams(), bridge: null }));
+
+      act(() => {
+        result.current.startOnboarding();
+      });
+
+      expect(mockSetOnboardingStatus).not.toHaveBeenCalled();
+    });
+
+    it("should not start onboarding if currency is null", () => {
+      const { result } = renderHook(() => useCantonBridge({ ...defaultParams(), currency: null }));
+
+      act(() => {
+        result.current.startOnboarding();
+      });
+
+      expect(mockSetOnboardingStatus).not.toHaveBeenCalled();
+    });
+
     it("should not start onboarding if accountToOnboard is undefined", () => {
       const mockBridge = createMockBridge();
       const { result } = renderHook(() =>
@@ -196,6 +216,30 @@ describe("useCantonBridge", () => {
       expect(mockBridge.authorizePreapproval).not.toHaveBeenCalled();
     });
 
+    it("should not authorize if bridge is null", () => {
+      const onboardingResult = createMockOnboardingResult();
+
+      const { result } = renderHook(() => useCantonBridge({ ...defaultParams(), bridge: null }));
+
+      act(() => {
+        result.current.authorizePreapproval(onboardingResult);
+      });
+
+      expect(mockSetAuthorizeStatus).not.toHaveBeenCalled();
+    });
+
+    it("should not authorize if currency is null", () => {
+      const onboardingResult = createMockOnboardingResult();
+
+      const { result } = renderHook(() => useCantonBridge({ ...defaultParams(), currency: null }));
+
+      act(() => {
+        result.current.authorizePreapproval(onboardingResult);
+      });
+
+      expect(mockSetAuthorizeStatus).not.toHaveBeenCalled();
+    });
+
     it("should reset error and set PREPARE status when starting authorization", () => {
       const mockBridge = createMockBridge();
       const onboardingResult = createMockOnboardingResult();

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/__tests__/useObservable.test.ts

@@ -43,6 +43,20 @@ describe("useObservable", () => {
     expect(mockOnNext).toHaveBeenNthCalledWith(3, "value3");
   });
 
+  it("should call onComplete when observable completes", () => {
+    const { result } = renderHook(() => useObservable());
+    const mockOnNext = jest.fn();
+    const mockOnComplete = jest.fn();
+    const observable = of("test-value");
+
+    act(() => {
+      result.current.subscribe(observable, { onNext: mockOnNext, onComplete: mockOnComplete });
+    });
+
+    expect(mockOnNext).toHaveBeenCalledWith("test-value");
+    expect(mockOnComplete).toHaveBeenCalledTimes(1);
+  });
+
   it("should call onError when observable errors", () => {
     const { result } = renderHook(() => useObservable());
     const mockOnNext = jest.fn();

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/hooks/useCantonBridge.ts

@@ -44,8 +44,8 @@ function isApprovedAuthorizeResult(
 }
 
 export interface UseCantonBridgeParams {
-  bridge: CantonCurrencyBridge;
-  currency: CryptoCurrency;
+  bridge: CantonCurrencyBridge | null;
+  currency: CryptoCurrency | null;
   device: Device | null | undefined;
   accountToOnboard: Account | undefined;
   setOnboardingStatus: (status: OnboardStatus) => void;
@@ -75,7 +75,7 @@ export function useCantonBridge({
   const { subscribe, unsubscribe } = useObservable();
 
   const startOnboarding = useCallback(() => {
-    if (!device || !accountToOnboard) {
+    if (!bridge || !currency || !device || !accountToOnboard) {
       return;
     }
 
@@ -125,7 +125,7 @@ export function useCantonBridge({
 
   const authorizePreapproval = useCallback(
     (result: OnboardingResult) => {
-      if (!device) {
+      if (!bridge || !currency || !device) {
         return;
       }
 
@@ -146,14 +146,16 @@ export function useCantonBridge({
               resetError();
               setOnboardingStatus(OnboardStatus.SUCCESS);
               setAuthorizeStatus(AuthorizeStatus.SUCCESS);
-              onOnboardingComplete?.();
             } else if (isCantonAuthorizeProgress(value)) {
               setAuthorizeStatus(value.status);
             }
           },
           onError: (error: Error) => {
             setAuthorizationError(error);
           },
+          onComplete: () => {
+            onOnboardingComplete?.();
+          },
         });
       } catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/hooks/useObservable.ts

@@ -4,6 +4,7 @@ import { Observable, Subscription } from "rxjs";
 interface UseObservableCallbacks<T> {
   onNext: (value: T) => void;
   onError?: (error: Error) => void;
+  onComplete?: () => void;
 }
 
 export function useObservable() {
@@ -23,6 +24,9 @@ export function useObservable() {
         error: (error: Error) => {
           callbacks.onError?.(error);
         },
+        complete: () => {
+          callbacks.onComplete?.();
+        },
       });
 
       subscriptionRef.current = subscription;

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/hooks/useOnboardModalViewModel.ts

@@ -82,8 +82,8 @@ export function useOnboardModalViewModel({
   }, [transitionTo]);
 
   const { startOnboarding, authorizePreapproval, unsubscribe } = useCantonBridge({
-    bridge: bridge!,
-    currency: currency!,
+    bridge,
+    currency,
     device,
     accountToOnboard: creatableAccount,
     setOnboardingStatus,
@@ -97,7 +97,7 @@ export function useOnboardModalViewModel({
   });
 
   const { handleAddAccounts, handleAddMore } = useOnboardingNavigation({
-    currency: currency!,
+    currency,
     selectedAccounts,
     existingAccounts,
     editedNames,

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/hooks/useOnboardingNavigation.ts

@@ -9,7 +9,7 @@ import type { OnboardingResult } from "../types";
 import { prepareAccountsForAdding } from "../utils/accountPreparation";
 
 export interface UseOnboardingNavigationParams {
-  currency: CryptoCurrency;
+  currency: CryptoCurrency | null;
   selectedAccounts: Account[];
   existingAccounts: Account[];
   editedNames: { [accountId: string]: string };
@@ -34,7 +34,6 @@ export function useOnboardingNavigation({
   const handleAddAccounts = useCallback(() => {
     const { accounts, renamings } = prepareAccountsForAdding({
       selectedAccounts,
-      existingAccounts,
       editedNames,
       isReonboarding,
       accountToReonboard,
@@ -72,6 +71,7 @@ export function useOnboardingNavigation({
   ]);
 
   const handleAddMore = useCallback(() => {
+    if (!currency) return;
     handleAddAccounts();
     dispatch(openModal("MODAL_ADD_ACCOUNTS", { currency }));
   }, [handleAddAccounts, dispatch, currency]);

apps/ledger-live-desktop/src/renderer/families/canton/OnboardModal/utils/accountPreparation.ts

@@ -4,7 +4,6 @@ import { Account } from "@ledgerhq/types-live";
 
 export type AddAccountsConfig = {
   selectedAccounts: Account[];
-  existingAccounts: Account[];
   editedNames: { [accountId: string]: string };
   isReonboarding?: boolean;
   accountToReonboard?: Account;

apps/ledger-live-desktop/src/renderer/families/canton/PendingTransferProposals/index.test.tsx

@@ -190,7 +190,6 @@ describe("PendingTransferProposals", () => {
           expect.objectContaining({
             currency: mockAccount.currency,
             device: mockDevice,
-            accounts: [],
             mainAccount: mockAccount,
             navigationSnapshot: expect.objectContaining({
               type: "transfer-proposal",