1 files changed, 42 insertions, 13 deletions

diff --git a/src/app.js b/src/app.js
index ffe9ba8..9789401 100644
--- a/src/app.js
+++ b/src/app.js
@@ -589,9 +589,9 @@ let _bootDeciding = true;
 // starts): the app notes the phase it reaches, and clears the count once it
 // has lived eight seconds or leaves cleanly. A page iOS kills while opening
 // does neither, so the third start in a row opens in safe mode.
-export function bootPhase(p) { try { localStorage.setItem('coinos-boot-phase', p); } catch {} }
+function bootPhase(p) { try { localStorage.setItem('coinos-boot-phase', p); } catch {} }
 function bootSettled() { try { localStorage.removeItem('coinos-boot'); } catch {} }
-export const safeBoot = () => !!(typeof window !== 'undefined' && window.__safeBoot);
+const safeBoot = () => !!(typeof window !== 'undefined' && window.__safeBoot);
 document.addEventListener('visibilitychange', () => { if (document.visibilityState === 'hidden') bootSettled(); });
 addEventListener('pagehide', bootSettled);
 // Belt and braces: a boot path that returns early (or throws) must not leave
@@ -1209,31 +1209,44 @@ let unit = (() => {
 // been fetched — a third position showing blanks is worse than two that work.
 function toggleUnit() {
   const ring = haveRate() ? ['sats', 'btc', 'fiat'] : ['sats', 'btc'];
+  const was = unit;
   unit = ring[(ring.indexOf(unit) + 1) % ring.length];
   try {
     localStorage.setItem(UNIT_KEY, unit);
   } catch {}
+  // An amount already typed into the send form is the same money in the new
+  // unit, not the same digits: 1000 sats does not become 1000 BTC. Whatever
+  // doesn't parse is left as typed.
+  for (const r of (ui.send && ui.send.recipients) || []) {
+    if (!r.amount || !String(r.amount).trim()) continue;
+    const sat = parseField(r.amount, was);
+    if (sat) r.amount = amountField(sat);
+  }
   render();
 }
 
 // A sats figure as the amount field types it in the current unit — what a
 // Max button or a fixed-amount invoice fills in. Fiat is floored to the
 // cent so a filled-in maximum never parses back to more than was offered.
-// The figure it filled is remembered with its exact sats: a fiat maximum
+// The figures it filled are remembered with their exact sats: a fiat maximum
 // rounded to the cent would otherwise parse back a few sats short and leave
-// them behind. Typing anything else parses as typed.
-let lastFill = null;
+// them behind. Typing anything else parses as typed. Several are kept so a
+// form with more than one amount round-trips each of them.
+const fills = new Map();
 function amountField(sat) {
   let s;
   const r = unit === 'fiat' && rateNow();
   if (unit === 'sats') s = String(sat);
   else if (r) s = (Math.floor((sat / 1e8) * r * 100) / 100).toFixed(2);
   else s = (sat / 1e8).toFixed(8);
-  lastFill = { s, unit, sat };
+  fills.delete(unit + '|' + s);
+  fills.set(unit + '|' + s, sat);
+  while (fills.size > 16) fills.delete(fills.keys().next().value);
   return s;
 }
 function parseField(v, u = unit) {
-  if (lastFill && lastFill.unit === u && String(v).trim() === lastFill.s) return lastFill.sat;
+  const k = u + '|' + String(v).trim();
+  if (fills.has(k)) return fills.get(k);
   return parseAmount(v, u, rateNow());
 }
 
@@ -3926,7 +3939,11 @@ async function publicMediaUpload(file) {
     if (error instanceof MediaUploadError && error.code === 'unauthorized') throw new Error(t('mediaUploadUnauthorized'));
     if (error instanceof MediaUploadError && error.code === 'too-big') throw new Error(t('mediaUploadTooBig'));
     if (error instanceof MediaUploadError && error.code === 'unsupported') throw new Error(t('mediaUploadUnsupported'));
-    throw new Error(t('msgUploadFailed'));
+    // what went wrong, said: "check your connection" alone hid a signer
+    // that never answered and hosts that refused the file
+    const why = String((error instanceof MediaUploadError ? error.details : '') || error?.message || '').slice(0, 200);
+    console.warn('media upload failed', error, why);
+    throw new Error(why && why !== 'failed' ? `${t('msgUploadFailed')} (${why})` : t('msgUploadFailed'));
   } finally {
     ui.mediaProgress = null;
   }
@@ -4197,16 +4214,18 @@ function onboardScreen() {
   }
   if (o.step === 'spend') {
     return page([
-      title(t('onbSpendTitle')),
-      h('p', { class: 'muted', style: 'margin:0' }, t('onbSpendBody')),
+      title(t(o.fromGift ? 'onbGiftNameTitle' : 'onbSpendTitle')),
+      h('p', { class: 'muted', style: 'margin:0' }, t(o.fromGift ? 'onbGiftNameBody' : 'onbSpendBody')),
       featureHook('namesClaimForm') || h('div', { class: 'row gap6', style: 'align-items:center' }, h('span', { class: 'spinner sm' }), h('span', { class: 'small muted' }, t('onbNameWait'))),
       // Optional means optional: one tap to the wallet, no questions — on
-      // Savings, the account that exists without any setup.
+      // Savings, the account that exists without any setup (or, after a
+      // gift, the account the gift arrived in).
       h('button', { class: 'btn-ghost btn-block', onClick: () => {
+        const home = o.home || 'savings';
         ui.onb = null;
         try { localStorage.removeItem(ONB_STEP_KEY); } catch {}
-        ui.account = 'savings';
-        try { localStorage.setItem(ACCOUNT_KEY, 'savings'); } catch {}
+        ui.account = home;
+        try { localStorage.setItem(ACCOUNT_KEY, home); } catch {}
         ui.tab = 'receive';
         render();
       } }, t('onbNotNow')),
@@ -4426,6 +4445,15 @@ function claimMigratedName() {
   attempt();
 }
 
+// After a gift is claimed into a fresh wallet (and its seed written down):
+// the wizard's name → look → done steps, the rest of a first run. `home` is
+// the account a skip lands on — the one the gift arrived in.
+function offerProfileSetup({ home = 'savings' } = {}) {
+  if (!canOfferSpending()) return false;
+  ui.onb = { step: 'spend', enterAddr: undefined, fromGift: true, home };
+  return true;
+}
+
 function leaveWizard() {
   ui.onb = null;
   try { localStorage.removeItem(ONB_STEP_KEY); } catch {}
@@ -6467,6 +6495,7 @@ const ctx = {
     || (wallet.nostrPubkey && wallet.nostrPubkey()) || (activeAccount() || {}).nostrPk || null,
   getAccount: () => accountSel(),
   setAccount: (a, dir) => setAccountSel(a, dir),
+  offerProfileSetup, pickConfirm,
   // Open (or create) a wallet from a mnemonic — used by nostr login.
   openMnemonic: async (mnemonic, passphrase, opts) => enterWallet(mnemonic, passphrase, opts),
   // Profile pictures retain the metadata-scrubbing image uploader. Public