1 files changed, 20 insertions, 3 deletions
diff --git a/src/features/messages.js b/src/features/messages.js
index 6f010b2..6c51d93 100644
--- a/src/features/messages.js
+++ b/src/features/messages.js
@@ -12767,8 +12767,15 @@ export function messagesFeature(ctx) {
       // when empty; move them when they pointed at our (old) address. A
       // deliberately foreign lud16/nip05 is the user's business.
       if (addr) {
-        for (const k of ['lud16', 'nip05'])
-          if (!merged[k] || merged[k] === oldAddr) merged[k] = addr;
+        const domain = addr.split('@')[1];
+        for (const k of ['lud16', 'nip05']) {
+          const cur = merged[k];
+          if (!cur || cur === oldAddr) { merged[k] = addr; continue; }
+          // a name at our own domain that is not ours and no longer answers
+          // (the placeholder a migration released) is ours now — Save is the
+          // heal an interactive signer can't do in the background
+          if (typeof cur === 'string' && cur !== addr && cur.split('@')[1] === domain && !/^_@/.test(cur) && await addressDead(cur)) merged[k] = addr;
+        }
       }
       if (merged.name) merged.display_name = merged.name;
       const partial = { kind: 0, content: JSON.stringify(merged), tags: [], created_at: kind0Stamp(id.pubkey) };
@@ -12796,6 +12803,11 @@ export function messagesFeature(ctx) {
   // alone. Once per address per session.
   const addrHealed = new Set();
   async function healStaleAddress(olds, myAddr) {
+    // Amber by intent needs a tap per signature: a background publish would
+    // sit in the kind-0 queue forever and block every later one. Save in the
+    // profile editor repoints the address for these users instead.
+    const id = await identity().catch(() => null);
+    if (!id || (id.signer && id.signer.interactive)) return;
     for (const old of olds) {
       if (addrHealed.has(old)) continue;
       addrHealed.add(old);
@@ -12957,7 +12969,10 @@ export function messagesFeature(ctx) {
     if (full) { const olds = [...new Set([stale(full.lud16), stale(full.nip05)].filter(Boolean))]; if (olds.length) healStaleAddress(olds, myAddr); }
     const rawNip05 = (full && (stale(full.nip05) ? myAddr : full.nip05)) || (mine && myAddr) || lp.nip05 || lp.addr || null;
     const nip05 = rawNip05 ? String(rawNip05).replace(/^_@/, '') : null;
-    const lud16 = (full && full.lud16 ? String(full.lud16) : null) || lp.lud16 || null;
+    // the lightning line too: a stale same-domain lud16 (jar@ after the
+    // rename to jarryd@) showed under the right NIP-05 as a second address
+    const rawLud = (full && full.lud16 ? String(full.lud16) : null) || lp.lud16 || null;
+    const lud16 = rawLud ? (stale(rawLud) ? myAddr : rawLud) : null;
     const showLud = lud16 && !/^npub1/i.test(lud16) && lud16 !== nip05;
     // an about of "~" or a lone character is noise, not a bio.
     // Until the full kind 0 lands, the light profile cache answers — it was
@@ -18404,6 +18419,8 @@ export function messagesFeature(ctx) {
     // lud16 and nip05 — but only where they pointed at the released address
     // (or were empty). Deliberately different values are not ours to touch.
     addressRenamed(oldAddr, newAddr) { return repointAddress(oldAddr, newAddr).catch(() => {}); },
+    // the profile editor's Save, without the editor (tests)
+    async saveProfileDraft(e) { const id = await identity(); return withKind0Lock(() => saveProfileNow(id, { name: '', about: '', picture: '', banner: '', ...e })); },
     // opens the profile, unless the caller has a step to take first (the
     // Accounts page switches to that identity before showing its profile)
     profileChip(pk, size, onOpen) {