1 files changed, 53 insertions, 11 deletions
diff --git a/src/features/ark.js b/src/features/ark.js
index 739dd5e..8b3121c 100644
--- a/src/features/ark.js
+++ b/src/features/ark.js
@@ -8,7 +8,7 @@ import * as btc from '@scure/btc-signer';
 import { HDKey } from '@scure/bip32';
 import { hex, base32nopad, bech32 } from '@scure/base';
 import { sha256 } from '@noble/hashes/sha256';
-import { ArkManager, remoteRenewalsInFlight, lnFoldedIds, renewPolicy, CUSTODY_TIERS } from '../ark/manager.js';
+import { ArkManager, remoteRenewalsInFlight, lnFoldedIds, sameDelivery, renewPolicy, CUSTODY_TIERS } from '../ark/manager.js';
 export { remoteRenewalsInFlight };
 
 // Coins this device may offer: spendable, and not held by a renewal another
@@ -646,6 +646,7 @@ export function arkFeature(ctx) {
     arkPersistFlushers.add(flushPersist);
     const mgr = new ArkManager({
       account: wallet.account(),
+      lnOldestFirst: () => getCustody() !== 'custodial',
       storage: {
         load: () => wallet.loadArkState(cfg.ark),
         adopt: (serverPubkey) => wallet.adoptArkState(serverPubkey, cfg.ark),
@@ -995,6 +996,26 @@ export function arkFeature(ctx) {
   // connections/offer belong to the nwc feature; when it isn't the caller
   // (an auto-withdraw setting changed, say) carry forward what's mirrored
   // rather than blanking someone's wallet connections.
+  // The mirror carries hundreds of pre-derived keys (BG_KEY_LOOKAHEAD) and
+  // is rewritten after every state change: derive each index once per
+  // account, not once per write.
+  const bgKeyMemo = new WeakMap(); // account node -> Map('chain:i' -> hex)
+  function bgKeyFor(account) {
+    let m = bgKeyMemo.get(account);
+    if (!m) { m = new Map(); bgKeyMemo.set(account, m); }
+    const chains = new Map();
+    return (chain, i) => {
+      const k = chain + ':' + i;
+      let v = m.get(k);
+      if (!v) {
+        let node = chains.get(chain);
+        if (!node) { node = account.deriveChild(chain); chains.set(chain, node); }
+        v = hex.encode(node.deriveChild(i).privateKey);
+        m.set(k, v);
+      }
+      return v;
+    };
+  }
   async function writeBgMirror(connections, offer, prefs) {
     const cfg = getArkConfig();
     if (!cfg || !ark || !ark.info || !ark.state) return;
@@ -1006,12 +1027,12 @@ export function arkFeature(ctx) {
       ark: { arkUrl: cfg.ark, esploraUrl: cfg.esplora, network: getNetwork(), serverPubkey: ark.info.serverPubkey, honorsExpired: !!cfg.honorsExpired },
       mgrState: ark.state,
       custody: getCustody(),
-      keyFor: (chain, i) => hex.encode(ark.account.deriveChild(chain).deriveChild(i).privateKey),
+      keyFor: bgKeyFor(ark.account),
       connections,
       offer,
       autowithdraw: await awMirror(prev),
     });
-    if (prev) rec.spends = prev.spends; // the worker's log survives rewrites
+    if (prev) { rec.spends = prev.spends; rec.pendingPays = prev.pendingPays; } // the worker's log survives rewrites
     if (prefs) rec.prefs = prefs; // notification choices the worker honours
     await saveBg(wallet._cacheKey(), rec);
     await disarmSiblingRecords(wallet._cacheKey(), rec).catch(() => {});
@@ -1499,9 +1520,12 @@ export function arkFeature(ctx) {
               h('span', { class: g.claimed ? 'tag conf' : 'tag' },
                 g.claimed ? t('giftClaimedTag') : g.revoked ? t('giftRevokedTag') : t('giftUnclaimedTag')));
           })(),
-          (() => { const pk = zapNoteFor(m); return pk ? ctx.hook('profileChip', pk) : null; })(),
-          m.status !== 'complete' && !failed ? h('span', { class: 'tag pending' }, m.status === 'pending' ? t('arkExitPendingTag') : m.status) : null),
-        h('div', { class: 'small faint' }, timeAgo(m.ts / 1000))),
+          (() => { const pk = zapNoteFor(m); return pk ? ctx.hook('profileChip', pk) : null; })()),
+        // the status tag sits by the time, not the name: in the narrow wallet
+        // column the title row has room for the label and the chip, not a
+        // third thing — the chip was breaking mid-name to make space
+        h('div', { class: 'row gap6 small faint' }, timeAgo(m.ts / 1000),
+          m.status !== 'complete' && !failed ? h('span', { class: 'tag pending' }, m.status === 'pending' ? t('arkExitPendingTag') : m.status) : null)),
       h('div', { style: 'text-align:right' },
         // in fiat this is what the payment was worth when it was made
         h('div', { class: failed ? 'muted' : incoming ? 'amount-pos' : 'amount-neg' }, fmtAmount(m.amountSat, m.ts / 1000)))
@@ -1670,6 +1694,7 @@ export function arkFeature(ctx) {
       })(),
       m.to ? row(t('arkPayTo'), shortAddr(m.to, 16, 12)) : null,
       m.vtxoId ? row(t('arkVtxoId'), shortTxid(m.vtxoId)) : null,
+      m.type === 'receive' ? coinListRows(t('arkVtxoId'), m.vtxoIds) : null,
       // the coins this payment consumed — a send can gather up to 24 inputs
       coinListRows(t('arkVtxoInputs'), m.inputIds),
       // An offboard's fee is two different pockets — the miners' cut for the
@@ -1718,7 +1743,7 @@ export function arkFeature(ctx) {
         const g = giftForMovement(m);
         const open = g && !g.claimed && !g.revoked;
         const chips = [
-          open ? copyBtn(`${location.origin}/g/${encodeArkGiftCode(getNetwork(), g.amountSat, hex.decode(g.secretHex))}`, t('giftCopyLinkAgain')) : null,
+          open ? copyBtn(`${location.origin}/g/${encodeArkGiftCode(getNetwork(), g.amountSat, hex.decode(g.secretHex))}${g.note ? '#m=' + encodeURIComponent(g.note) : ''}`, t('giftCopyLinkAgain')) : null,
           m.preimage ? copyBtn(m.preimage, t('copyPreimage')) : null,
           m.txid ? copyBtn(m.txid, t('copyTxid')) : null,
           m.txid ? h('a', { class: 'btn btn-sm', href: url, target: '_blank', rel: 'noopener', onClick: (e) => { e.preventDefault(); openExternal(url); } }, t('viewOnMempool')) : null,
@@ -3167,7 +3192,7 @@ export function arkFeature(ctx) {
   // Fund a fresh bearer gift identity. Shared by the gifts feature's hook and
   // the zap flow's locked-gift fallback; `lockedTo` records who a locked gift
   // was for (the sender can still revoke either kind while unclaimed).
-  async function createArkGift(amountSat, lockedTo = null) {
+  async function createArkGift(amountSat, lockedTo = null, note = null) {
     const mgr = await connectArk();
     const secret = crypto.getRandomValues(new Uint8Array(32));
     const secretHex = hex.encode(secret);
@@ -3177,7 +3202,7 @@ export function arkFeature(ctx) {
     const action = mgr.state.actions.find((a) => a.id === actionId);
     if (!action || action.step === 'failed') throw new Error(action?.error || t('claimFailed'));
     const vtxoId = decodeVtxo(hex.decode((action.destBytesList || [action.destBytes])[0])).id;
-    arkGiftRecords().push({ id: vtxoId, amountSat, secretHex, created: Date.now(), revoked: false, claimed: false, ...(lockedTo ? { lockedTo } : {}) });
+    arkGiftRecords().push({ id: vtxoId, amountSat, secretHex, created: Date.now(), revoked: false, claimed: false, ...(lockedTo ? { lockedTo } : {}), ...(note ? { note } : {}) });
     mgr._save();
     return { code: encodeArkGiftCode(getNetwork(), amountSat, secret), amount: amountSat, address };
   }
@@ -4289,7 +4314,22 @@ export function arkFeature(ctx) {
       for (const m of s.movements || []) for (const id of m.inputIds || []) accounted.add(id);
       const out = [];
       const seenCoin = new Set();
+      // One payment delivered as several coins (a gift held in two, a
+      // dust-padded split) is one row: receives from the same mailbox
+      // message (`batch`; older rows: the same delivery instant) fold.
+      const folded = new Map();
       for (const m of moves) {
+        if (m.type === 'receive' && sameDelivery(out[out.length - 1], m)) {
+          const last = out[out.length - 1];
+          if (!folded.has(last.id)) {
+            const f = { ...last, vtxoIds: [last.vtxoId], vtxoId: null };
+            out[out.length - 1] = f; folded.set(f.id, f);
+          }
+          const f = folded.get(last.id);
+          f.amountSat += m.amountSat;
+          f.vtxoIds.push(m.vtxoId);
+          continue;
+        }
         if (m.type !== 'reconcile') { out.push(m); continue; }
         if (m.vtxoId && (seenCoin.has(m.vtxoId) || accounted.has(m.vtxoId))) continue;
         if (m.vtxoId) seenCoin.add(m.vtxoId);
@@ -4302,6 +4342,7 @@ export function arkFeature(ctx) {
           out.push({ ...m, count: 1, vtxoIds: m.vtxoId ? [m.vtxoId] : [] });
         }
       }
+      this._histFolded = folded; // a folded row's detail shows the whole payment
       return exits.concat(renewals, lnPending, out.map((m) => ({ time: m.ts, render: () => arkHistoryItem(m), csv: arkCsvRow(m) })));
     },
     historyDetail() {
@@ -4321,7 +4362,8 @@ export function arkFeature(ctx) {
         if (done) return arkMoveDetailView(done);
         if (a && !['done', 'failed'].includes(a.step)) return arkMoveDetailView(lnPendingMove(a));
       }
-      const m = s ? (s.movements || []).find((x) => x.id === ui.arkMoveDetail) : null;
+      if (s) this.historyEntries(); // (memoized) keeps the folded rows current
+      const m = s ? (this._histFolded && this._histFolded.get(ui.arkMoveDetail)) || (s.movements || []).find((x) => x.id === ui.arkMoveDetail) : null;
       if (m) return arkMoveDetailView(m);
       ui.arkMoveDetail = null;
       return null;
@@ -4472,7 +4514,7 @@ export function arkFeature(ctx) {
       setNetwork(g.net);
       return true;
     },
-    arkGiftCreate(amountSat) { return createArkGift(amountSat); },
+    arkGiftCreate(amountSat, note) { return createArkGift(amountSat, null, note); },
     // Claim-side status: claimable (with the live amount), taken, wrongnet, or
     // unknown (not visible here — wrong server or not yet delivered).
     async arkGiftStatus(code) {