1 files changed, 14 insertions, 0 deletions
diff --git a/src/ark/manager.js b/src/ark/manager.js
index 810808c..aea6020 100644
--- a/src/ark/manager.js
+++ b/src/ark/manager.js
@@ -92,6 +92,16 @@ const actionTs = (a) => Number(String(a.id || '').split('-').pop()) || 0;
 // claim recorded before it stamped them — the same amount within minutes).
 // Derived at read time, never deleted: a synced copy from another device
 // can't bring a twin back.
+// Two receive rows that are one payment delivered as several coins (a gift
+// held in two swept at once, a dust-padded split): the same mailbox message
+// (`batch`), or for rows recorded before the stamp, the same delivery instant.
+// A receive the registrar's receipts tagged ⚡ is its own payment.
+export function sameDelivery(a, b) {
+  return !!a && !!b && a.type === 'receive' && b.type === 'receive'
+    && a.status === 'complete' && b.status === 'complete' && !a.viaLn && !b.viaLn
+    && (a.batch || b.batch ? a.batch === b.batch : !!a.ts && a.ts === b.ts);
+}
+
 export function lnFoldedIds(movements) {
   const out = new Set();
   const recs = (movements || []).filter((m) => m.type === 'receive' && m.status === 'complete' && m.vtxoId);
@@ -805,9 +815,13 @@ export class ArkManager {
       // same message concurrently (validation awaits in between), and only the
       // copy that actually added the vtxo may record the receive movement.
       if (!this._addVtxo(v, v._raw.bytes, 0)) continue;
+      // `batch` names the mailbox message: one payment can arrive as several
+      // coins (a sweep of a gift held in two, a dust-padded split), and the
+      // history folds a message's coins back into one row
       this._movement({
         type: 'receive', amountSat: v.amountSat, status: 'complete', vtxoId: v.id,
         ts: ckTs ?? (live ? Date.now() : this._estimateReceiveTs(v, tip)),
+        ...(m.checkpoint ? { batch: String(m.checkpoint) } : {}),
       });
       changed = true;
     }