chore: apply PR feedbacks

apps/ledger-live-desktop/src/newArch/WalletSync/hooks/useTrustchainSdk.ts

@@ -8,6 +8,7 @@ import Transport from "@ledgerhq/hw-transport";
 import { trustchainLifecycle } from "@ledgerhq/live-wallet/walletsync/index";
 import { useStore } from "react-redux";
 import { walletSelector } from "~/renderer/reducers/wallet";
+import { wsStateSelector } from "@ledgerhq/live-wallet/src/store";
 
 export function runWithDevice<T>(
   deviceId: string | undefined,
@@ -35,7 +36,7 @@ export function useTrustchainSdk() {
   const lifecycle = useMemo(
     () =>
       trustchainLifecycle({
-        getCurrentWSState: () => walletSelector(store.getState()).wsState,
+        getCurrentWSState: () => wsStateSelector(walletSelector(store.getState())),
       }),
     [store],
   );

apps/ledger-live-desktop/src/newArch/WalletSync/hooks/useWatchWalletSync.ts

@@ -21,7 +21,7 @@ import {
 import { TrustchainEjected } from "@ledgerhq/trustchain/errors";
 import { State } from "~/renderer/reducers";
 import { cache as bridgeCache } from "~/renderer/bridge/cache";
-import { setAccountNames, walletSyncUpdate } from "@ledgerhq/live-wallet/store";
+import { setAccountNames, walletSyncUpdate, wsStateSelector } from "@ledgerhq/live-wallet/store";
 import { replaceAccounts } from "~/renderer/actions/accounts";
 import noop from "lodash/noop";
 import { log } from "@ledgerhq/logs";
@@ -36,7 +36,7 @@ function localStateSelector(state: State): LocalState {
 }
 
 function latestDistantStateSelector(state: State): DistantState | null {
-  return walletSelector(state).wsState.data;
+  return wsStateSelector(walletSelector(state)).data;
 }
 
 export type WalletSyncUserState = {
@@ -52,8 +52,8 @@ export function useCloudSyncSDK(): CloudSyncSDK<Schema> {
   const dispatch = useDispatch();
 
   const getCurrentVersion = useCallback(() => {
-    const state = walletSelector(store.getState());
-    return state.wsState.version;
+    const wsState = wsStateSelector(walletSelector(store.getState()));
+    return wsState.version;
   }, [store]);
 
   const saveNewUpdate = useCallback(
@@ -64,7 +64,7 @@ export function useCloudSyncSDK(): CloudSyncSDK<Schema> {
           const state = store.getState();
           const version = event.version;
           const data = event.data;
-          const wsState = walletSelector(state).wsState;
+          const wsState = wsStateSelector(walletSelector(state));
           const localState = localStateSelector(state);
           const ctx = { getAccountBridge, bridgeCache, blacklistedTokenIds: [] };
 

libs/live-wallet/src/store.test.ts

@@ -13,7 +13,9 @@ import {
   setAccountName,
   setAccountNames,
   setAccountStarred,
+  walletStateExportShouldDiffer,
   walletSyncUpdate,
+  wsStateSelector,
 } from "./store";
 import { genAccount } from "@ledgerhq/coin-framework/mocks/account";
 import type { Account } from "@ledgerhq/types-live";
@@ -185,7 +187,7 @@ describe("Wallet store", () => {
       wsState: { data: {}, version: 42 },
     };
     const result = handlers.IMPORT_WALLET_SYNC(initialState, importWalletState(exportedState));
-    expect(result.wsState).toEqual({ data: {}, version: 42 });
+    expect(wsStateSelector(result)).toEqual({ data: {}, version: 42 });
   });
 
   it("can export the wallet state", () => {
@@ -197,4 +199,17 @@ describe("Wallet store", () => {
       wsState: { data: {}, version: 42 },
     });
   });
+
+  it("walletStateExportShouldDiffer", () => {
+    const exportedState = {
+      wsState: { data: {}, version: 42 },
+    };
+    const result = handlers.IMPORT_WALLET_SYNC(initialState, importWalletState(exportedState));
+    expect(exportWalletState(result)).toEqual({
+      wsState: { data: {}, version: 42 },
+    });
+    expect(walletStateExportShouldDiffer(initialState, result)).toBe(true);
+    expect(walletStateExportShouldDiffer(initialState, initialState)).toBe(false);
+    expect(walletStateExportShouldDiffer(result, result)).toBe(false);
+  });
 });

libs/live-wallet/src/store.ts

@@ -231,3 +231,5 @@ export const exportWalletState = (state: WalletState): ExportedWalletState => ({
 export const walletStateExportShouldDiffer = (a: WalletState, b: WalletState): boolean => {
   return a.wsState !== b.wsState;
 };
+
+export const wsStateSelector = (state: WalletState): WSState => state.wsState;