Fixes issue with applying changes to past operations

NicolasFlamel1 · Nov 23, 2022 · 8d2248d · 8d2248d
1 parent b758e20
commit 8d2248d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git a/libs/ledger-live-common/src/families/mimblewimble_coin/js-synchronisation.ts b/libs/ledger-live-common/src/families/mimblewimble_coin/js-synchronisation.ts
@@ -119,5 +119,6 @@ export const scanAccounts = makeScanAccounts({
 });
 
 export const sync = makeSync({
-  getAccountShape
+  getAccountShape,
+  shouldMergeOps: false
 });
diff --git a/libs/ledger-live-common/src/reconciliation.ts b/libs/ledger-live-common/src/reconciliation.ts
@@ -207,18 +207,36 @@ export function patchAccount(
     }
   }
 
-  const operations = patchOperations(
-    account.operations,
-    updatedRaw.operations,
-    updatedRaw.id,
-    subAccounts
-  );
-  const pendingOperations = patchOperations(
-    account.pendingOperations,
-    updatedRaw.pendingOperations,
-    updatedRaw.id,
-    subAccounts
-  );
+  let shouldMergeOps: boolean;
+  switch (account.currency.family) {
+    case "mimblewimble_coin":
+      shouldMergeOps = false;
+      break;
+    default:
+      shouldMergeOps = true;
+      break;
+  }
+  let operations: Operation[];
+  let pendingOperations: Operation[];
+  if (shouldMergeOps) {
+    operations = patchOperations(
+      account.operations,
+      updatedRaw.operations,
+      updatedRaw.id,
+      subAccounts
+    );
+    pendingOperations = patchOperations(
+      account.pendingOperations,
+      updatedRaw.pendingOperations,
+      updatedRaw.id,
+      subAccounts
+    );
+  }
+  else {
+    operations = updatedRaw.operations.map(raw => fromOperationRaw(raw, updatedRaw.id, subAccounts));
+    pendingOperations = updatedRaw.pendingOperations.map(raw => fromOperationRaw(raw, updatedRaw.id, subAccounts));
+  }
+
   const next: Account = { ...account };
   let changed = false;