Ledger Sync - Fix side effect causing the synchronization to stop working

.changeset/brown-ducks-rule.md

@@ -0,0 +1,7 @@
+---
+"ledger-live-desktop": patch
+"live-mobile": patch
+"@ledgerhq/live-wallet": patch
+---
+
+Ledger Sync - Fixed side effect that caused the synchronization to stop working

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

@@ -24,7 +24,10 @@ import {
   WSState,
 } from "@ledgerhq/live-wallet/store";
 import { replaceAccounts } from "~/renderer/actions/accounts";
-import { latestDistantStateSelector } from "~/renderer/reducers/wallet";
+import {
+  latestDistantStateSelector,
+  latestDistantVersionSelector,
+} from "~/renderer/reducers/wallet";
 import { useTrustchainSdk } from "./useTrustchainSdk";
 import { useOnTrustchainRefreshNeeded } from "./useOnTrustchainRefreshNeeded";
 import { Dispatch } from "redux";
@@ -80,6 +83,7 @@ export function useCloudSyncSDK(): CloudSyncSDK<Schema> {
         ctx,
         getState,
         latestDistantStateSelector,
+        latestDistantVersionSelector,
         localStateSelector,
         saveUpdate,
       }),

apps/ledger-live-desktop/src/renderer/reducers/wallet.ts

@@ -27,6 +27,10 @@ export function latestDistantStateSelector(state: State): DistantState | null {
   return walletSyncStateSelector(walletSelector(state)).data;
 }
 
+export function latestDistantVersionSelector(state: State): number {
+  return walletSyncStateSelector(walletSelector(state)).version;
+}
+
 export const useMaybeAccountName = (
   account: AccountLike | null | undefined,
 ): string | undefined => {

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

@@ -27,7 +27,7 @@ import { walletSelector } from "~/reducers/wallet";
 import { State } from "~/reducers/types";
 import { bridgeCache } from "~/bridge/cache";
 import { replaceAccounts } from "~/actions/accounts";
-import { latestDistantStateSelector } from "~/reducers/wallet";
+import { latestDistantStateSelector, latestDistantVersionSelector } from "~/reducers/wallet";
 import { useFeature } from "@ledgerhq/live-common/featureFlags/index";
 import getWalletSyncEnvironmentParams from "@ledgerhq/live-common/walletSync/getEnvironmentParams";
 
@@ -80,6 +80,7 @@ export function useCloudSyncSDK(): CloudSyncSDK<Schema> {
         ctx,
         getState,
         latestDistantStateSelector,
+        latestDistantVersionSelector,
         localStateSelector,
         saveUpdate,
       }),

apps/ledger-live-mobile/src/reducers/wallet.ts

@@ -27,6 +27,10 @@ export function latestDistantStateSelector(state: State): DistantState | null {
   return walletSyncStateSelector(walletSelector(state)).data;
 }
 
+export function latestDistantVersionSelector(state: State): number {
+  return walletSyncStateSelector(walletSelector(state)).version;
+}
+
 export const useMaybeAccountName = (
   account: AccountLike | null | undefined,
 ): string | undefined => {

apps/web-tools/trustchain/components/AppAccountsSync.tsx

@@ -53,6 +53,7 @@ const localStateSelector = (state: State) => ({
 });
 
 const latestDistantStateSelector = (state: State) => state.walletState.walletSyncState.data;
+const latestDistantVersionSelector = (state: State) => state.walletState.walletSyncState.version;
 
 export default function AppAccountsSync({
   deviceId,
@@ -141,6 +142,7 @@ export default function AppAccountsSync({
         ctx,
         getState,
         latestDistantStateSelector,
+        latestDistantVersionSelector,
         localStateSelector,
         saveUpdate,
       }),

libs/live-wallet/src/walletsync/incrementalUpdates.ts

@@ -8,12 +8,14 @@ export function makeSaveNewUpdate<S>({
   ctx,
   getState,
   latestDistantStateSelector,
+  latestDistantVersionSelector,
   localStateSelector,
   saveUpdate,
 }: {
   ctx: WalletSyncDataManagerResolutionContext;
   getState: () => S;
   latestDistantStateSelector: (state: S) => DistantState | null;
+  latestDistantVersionSelector: (state: S) => number;
   localStateSelector: (state: S) => LocalState;
   saveUpdate: (
     data: DistantState | null,
@@ -27,6 +29,7 @@ export function makeSaveNewUpdate<S>({
       case "new-data": {
         // we resolve incoming distant state changes
         const state = getState();
+        const latestVersion = latestDistantVersionSelector(state);
         const latest = latestDistantStateSelector(state);
         const local = localStateSelector(state);
         const data = event.data;
@@ -41,6 +44,9 @@ export function makeSaveNewUpdate<S>({
         } else {
           log("walletsync", "resolved. no changes to apply.");
         }
+        if (event.version !== latestVersion) {
+          await saveUpdate(data, event.version, null);
+        }
         break;
       }
       case "pushed-data": {