@wix/himalaya-cli 0.1524.0 → 0.1526.0

package/templates/retail-store/dev/index.ts

@@ -1723,8 +1723,10 @@ const SCREENS = runtimeSetting({
                                     "actionId": "himi.open",
                                     "params": {
                                       "screenId": "himi_sign_in",
-                                      "mode": "signin"
-                                    }
+                                      "mode": "signin",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               }
@@ -1742,8 +1744,10 @@ const SCREENS = runtimeSetting({
                                     "actionId": "himi.open",
                                     "params": {
                                       "screenId": "himi_sign_in",
-                                      "mode": "register"
-                                    }
+                                      "mode": "register",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               }
@@ -2864,6 +2868,8 @@ const SCREENS = runtimeSetting({
             "memberAccountLinks": "1",
             "restorePurchases": "1",
             "signInScreen": "himi_sign_in",
+            "signInPresentation": "sheet",
+            "signInReturnTab": "profile",
             "pollIdentity": "1",
             "cartCount": "1",
             "copy": "{\"account.subtitle\":\"Orders and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — your cart stays with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — your cart stays with you.\"}"
@@ -3139,8 +3145,10 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "returnScreenId": "himi_account_settings"
-                            }
+                              "returnScreenId": "himi_account_settings",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       },
@@ -5050,8 +5058,7 @@ const SCREENS = runtimeSetting({
                           "style": "primary",
                           "fullWidth": true,
                           "action": {
-                            "actionId": "nav.back",
-                            "presentation": "back"
+                            "actionId": "tier5.himiStoreAccount.leave"
                           }
                         }
                       }
@@ -5092,7 +5099,7 @@ const SCREENS = runtimeSetting({
       "declaredCapabilities": [
         "wix_api"
       ],
-      "minBinaryVersion": "0.2.0",
+      "minBinaryVersion": "1.7.0",
       "bundleVersion": "0.0.1"
     }
   },
@@ -5959,8 +5966,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "profile",
-                              "returnScreenId": "himi_view_profile"
-                            }
+                              "returnScreenId": "himi_view_profile",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -14783,8 +14792,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "orders",
-                              "returnScreenId": "himi_orders"
-                            }
+                              "returnScreenId": "himi_orders",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -15417,8 +15428,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "addresses",
-                              "returnScreenId": "himi_addresses"
-                            }
+                              "returnScreenId": "himi_addresses",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -16474,8 +16487,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "addresses",
-                              "returnScreenId": "himi_address"
-                            }
+                              "returnScreenId": "himi_address",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -17145,8 +17160,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "wallet",
-                              "returnScreenId": "himi_wallet"
-                            }
+                              "returnScreenId": "himi_wallet",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -17367,8 +17384,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "post",
-                              "returnScreenId": "himi_create_post"
-                            }
+                              "returnScreenId": "himi_create_post",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -21602,8 +21621,10 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                     "params": {
                       "screenId": "himi_sign_in",
                       "returnScreenId": "himi_order",
-                      "returnId": "$service:himiBrandedOrder.id"
-                    }
+                      "returnId": "$service:himiBrandedOrder.id",
+                      "modal": "1"
+                    },
+                    "presentation": "sheet"
                   }
                 }
               },

package/templates/retail-store/tier5-src/himi-store-account/index.ts

@@ -26,6 +26,10 @@ interface AuthRouteInput {
   returnScreenId?: string;
   returnId?: string;
   returnChannelId?: string;
+  /** Standalone sign-in only: "1" when it was opened as a modal (sheet / cover). */
+  modal?: string;
+  /** Modal only: the tab whose stack the return screen opens on once the modal closes. */
+  returnTab?: string;
 }
 
 // The screen's boot input survives refresh; consuming it must survive too.
@@ -61,6 +65,12 @@ function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authConte
   };
 }
 
+/** How the standalone form leaves. A modal is closed: on web `back` pops the tab's stack,
+ *  not the modal. A pushed form goes back. */
+function leaveNav(): "dismiss" | "back" {
+  return routeInput().modal === "1" ? "dismiss" : "back";
+}
+
 /** Where a successful sign-in returns to, or null. Never Account itself — that would
  *  only push a second copy of the screen the member is already on. */
 function resumeTarget(s: Pick<S, "returnScreenId" | "returnId" | "returnChannelId">): { screenId: string; args?: Record<string, string> } | null {
@@ -78,11 +88,26 @@ function resumeTarget(s: Pick<S, "returnScreenId" | "returnId" | "returnChannelI
  *  On the standalone sign-in screen the target is pushed, not a `replace`: on iOS and
  *  Android `replace` resets the stack to its root, which would drop the screens the
  *  visitor came through. Back from the target shows the form again, and the form sends a
- *  member back on appear (settle). With no target the form goes back. */
+ *  member back on appear (settle). With no target the form goes back.
+ *
+ *  A modal form closes. A target pushed from here would open inside the modal (iOS, Android)
+ *  or under it (web), so a modal that names a `returnTab` hands the target to that tab: the
+ *  host closes the modal, then pushes it on that tab's stack (Account's member rows). A host
+ *  showing no such tab (a drawer, a narrow Mac window) drops that request whole, modal and
+ *  all, so the modal is also dismissed directly: it always closes, and the row opens where
+ *  the tab exists. With no `returnTab` it only closes, and the screen under it loads again —
+ *  the screen that opened the modal is the return target. */
 function resumeAfterAuth(next: S): S {
   const target = resumeTarget(next);
   if (!next.isMember) return next;
-  if (!target) return next.standalone ? navigate(next, { presentation: "back" }) : next;
+  const tab = routeInput().modal === "1" ? routeInput().returnTab ?? "" : "";
+  if (target && tab && next.standalone) {
+    routeInputConsumed = true;
+    void dispatch("himi.open", { presentation: "dismiss" });
+    const cleared = derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" });
+    return navigate(cleared, target.args ? { tab, screenId: target.screenId, args: target.args } : { tab, screenId: target.screenId });
+  }
+  if (!target || routeInput().modal === "1") return next.standalone ? navigate(next, { presentation: leaveNav() }) : next;
   routeInputConsumed = true;
   const cleared = derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" });
   return navigate(cleared, target);
@@ -96,11 +121,31 @@ function forwardToSignIn(next: S): S {
   if (!next.authIntent && !next.returnScreenId) return next;
   routeInputConsumed = true;
   const args: Record<string, string> = { mode: "signin" };
-  for (const key of ["authIntent", "authContextName", "returnScreenId", "returnId", "returnChannelId"] as const) {
-    if (next[key]) args[key === "authIntent" ? "intent" : key === "authContextName" ? "contextName" : key] = next[key];
+  for (const key of ["authIntent", "authContextName"] as const) {
+    if (next[key]) args[key === "authIntent" ? "intent" : "contextName"] = next[key];
+  }
+  return openSignIn(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" }),
+    args, resumeTarget(next));
+}
+
+/** Account sends a guest to the standalone sign-in screen, with `after`, the member screen to
+ *  open once signed in. With a `signInPresentation` appear param it opens as that modal, and
+ *  `after` goes on Account's own tab (`signInReturnTab`) when the modal closes; pushed, the form
+ *  pushes `after` itself (resumeAfterAuth). */
+function openSignIn(next: S, args: Record<string, string>, after: { screenId: string; args?: Record<string, string> } | null): S {
+  const screenId = next.signInScreen || "himi_sign_in";
+  const presentation = signInPresentationRequested;
+  const back: Record<string, string> = {};
+  if (after) {
+    back.returnScreenId = after.screenId;
+    if (after.args?.id) back.returnId = after.args.id;
+    if (after.args?.channelId) back.returnChannelId = after.args.channelId;
   }
-  return navigate(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" }),
-    { screenId: next.signInScreen, args });
+  if (!presentation) return navigate(next, { screenId, args: { ...args, ...back } });
+  const modalArgs: Record<string, string> = { ...args, modal: "1" };
+  // With no tab to open it on, a modal has no way to the member screen: it only closes.
+  if (after && signInReturnTabRequested) Object.assign(modalArgs, back, { returnTab: signInReturnTabRequested });
+  return navigate(next, { screenId, presentation, args: modalArgs });
 }
 
 /** After a load: the standalone sign-in screen sends a member back (a stale link, or a
@@ -128,8 +173,11 @@ function settle(next: S, arg: unknown, latest = true): S {
     // The appear refresh returns `_nav`, which every host applies — binaries from before
     // worker nav dispatch included. Only an arg-less load, whose result iOS
     // discards, dispatches.
-    if (strField(arg, "standalone") === "1") return navigate(cleared, { presentation: "back" });
-    void dispatch("himi.open", { presentation: "back" });
+    if (strField(arg, "standalone") === "1") return navigate(cleared, { presentation: leaveNav() });
+    // Not from a modal: nothing pushed over it comes back to it, and on iOS the closing modal's
+    // own screen reloads here once, after it has asked to close — a late dismiss would close
+    // whatever modal is open by then.
+    if (routeInput().modal !== "1") void dispatch("himi.open", { presentation: leaveNav() });
     return cleared;
   }
   // Account forwards only on an appear refresh: the boot `load()` has no params and its
@@ -180,6 +228,10 @@ let appliedSeq = 0;
 // The appear params belong to the worker session too, like the two flags above: a probe
 // dropped because the visitor typed must not take them with it.
 let signInScreenRequested = "";
+/** Account only: how it opens the standalone sign-in screen ("" = push). */
+let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
+/** Account only: its tab, where a member screen opens after a modal sign-in. */
+let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
@@ -210,6 +262,9 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
     passwordDraft = "";
   }
   signInScreenRequested ||= strField(arg, "signInScreen") || s.signInScreen;
+  const presentation = strField(arg, "signInPresentation");
+  if (presentation === "sheet" || presentation === "full_screen") signInPresentationRequested = presentation;
+  signInReturnTabRequested ||= strField(arg, "signInReturnTab");
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
@@ -676,6 +731,7 @@ const svc = defineService<S, {
   signOut: (s: S) => Promise<S>;
   sync: (s: S) => Promise<S | undefined>;
   openMember: (s: S, arg?: unknown) => Promise<S>;
+  leave: (s: S) => S;
   restorePublish: (s: S) => S;
   iapRestore: (s: S) => Promise<undefined>;
 }>("himiStoreAccount", {
@@ -756,7 +812,8 @@ const svc = defineService<S, {
       return "next" in r ? r.next : undefined;
     },
     // A row to a member-only screen shows to a guest too. A member opens it; a guest signs
-    // in first and the sign-in screen replaces itself with it, so Back returns here.
+    // in first, and the sign-in screen then opens the row's screen — as a modal, by closing
+    // and pushing it on this tab (openSignIn) — so Back returns here either way.
     openMember: async (s, arg): Promise<S> => {
       const screenId = strField(arg, "screenId");
       if (!screenId) return s;
@@ -764,8 +821,10 @@ const svc = defineService<S, {
       // From the state as it is now: a probe may have landed during the identity read.
       const now = svc.getState();
       if (member) return navigate(now, { screenId });
-      return navigate(now, { screenId: now.signInScreen || "himi_sign_in", args: { mode: "signin", returnScreenId: screenId } });
+      return openSignIn(now, { mode: "signin" }, { screenId });
     },
+    // The standalone form's Continue: leaves the form the way it was opened.
+    leave: (s) => navigate(s, { presentation: leaveNav() }),
     // Typing means any focus request was delivered: clear the tokens (safe while mounted, since
     // bumpToken never repeats), so a visit rarely ends — and a pooled form rarely reopens —
     // holding one.

package/templates/retail-store/tier5-src/himi-store-product/index.ts

@@ -93,6 +93,25 @@ function productPolicyBody(product: StoreProduct, kind: "returns" | "shipping"):
  *  DIFFERENT product (drop the picks) from the same product coming back (keep them). */
 let lastLoadedId: string | undefined;
 let productLoadSequence = 0;
+let booting = true;
+let bootLoad: { id: string; state: Promise<S> } | undefined;
+
+/** The host replays the screen's onAppear load right after the module-scope one: that one replay
+ *  joins the boot load instead of reading the product, cart and App Store prices again. Any later
+ *  entry loads afresh, since the cart, the saved flag or a purchase may have changed meanwhile. */
+function joinedLoad(id: string, load: () => Promise<S>): Promise<S> {
+  if (booting) {
+    booting = false;
+    const current = { id, state: load() };
+    bootLoad = current;
+    const settle = () => { if (bootLoad === current) bootLoad = undefined; };
+    current.state.then(settle, settle);
+    return current.state;
+  }
+  const replayed = bootLoad;
+  bootLoad = undefined;
+  return replayed?.id === id ? replayed.state : load();
+}
 
 interface OptionSlots {
   opt1Label: string; opt1Chips: OptionChip[]; opt1Selected: string[]; opt1SelectedId: string; opt1Placeholder: string; noOpt1: boolean;
@@ -576,144 +595,146 @@ const svc = defineService<S, {
     purchasedNote: "",
   }),
   actions: {
-    load: async (s, arg): Promise<S> => {
+    load: (s, arg): Promise<S> => {
       stashCopy(arg);
-      enterCheckout();
-      const sequence = ++productLoadSequence;
-      lastProduct = undefined;
-      const id = inputId();
-      // Storage problems must not prevent browsing or buying a product.
-      let saved = false;
-      try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
-      s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
-      // A fresh navigation into the product resets any quantity left over
-      // from a previous visit to the same worker instance.
-      if (!id) {
+      return joinedLoad(inputId(), async (): Promise<S> => {
+        enterCheckout();
+        const sequence = ++productLoadSequence;
         lastProduct = undefined;
-        lastLoadedId = undefined;
-        return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
-      }
-      // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
-      // of after it — it used to add a whole cart round trip before the page could paint.
-      const cartCount = cartItemCount();
-      // The badge must never hold the page: remember the count if it is already in, and
-      // publish it separately if it lands after the product (#3468 review).
-      let cartKnown: number | undefined;
-      void cartCount.then((n) => { cartKnown = n; }, () => {});
-      // The live product read goes out FIRST too — the local-db read below must never delay it.
-      // Settled into a value so a failure is handled where it is awaited, never unhandled.
-      // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
-      const live = getStoreProduct(id, ["DESCRIPTION"]).then(
-        (r) => ({ ok: true as const, r }),
-        () => ({ ok: false as const }),
-      );
-      // Paint at once from the row the list already synced (name, price, image) — the page used
-      // to sit on its skeleton for the product round trip even when the list had just shown it.
-      // The live read then fills in the description and gallery.
-      const synced = await readCachedProduct(id);
-      let painted = false;
-      if (synced && s.status === "loading") {
-        await svc.paintCached(synced);
-        painted = true;
-      }
-      const outcome = await live;
-      if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
-      // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
-      // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
-      // they did — overwriting it would untick a stored save, reset the quantity, and drop the
-      // in-flight add's `adding` guard (a second tap would add the line twice).
-      const base: S = painted ? (svc.getState() as S) : s;
-      const keep = painted
-        ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
-        : { cartHint: "", quantity: 1 };
-      const badge = (): number => {
-        if (painted && (base.adding || base.added)) return base.cartCount;
-        if (cartKnown !== undefined) return cartKnown;
-        const epoch = cartBadgeEpoch;
-        void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
-        return base.cartCount;
-      };
-      if (outcome.ok) {
-        const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
-        const name = cleanTitle(p.name) || "Product";
-        const image = productImage(p, WIX_DETAIL_IMAGE);
-        lastProduct = p;
-        // A group with exactly one choice is chosen for the shopper; a real choice
-        // is left blank so the pick is deliberate.
-        const optionGroups = productOptions(p);
-        const sale = productSale(p);
-        // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
-        // trip to the cart and back silently clears the size the shopper picked and
-        // re-disables the CTA with no explanation. Carry the picks when this is the SAME
-        // product, and only for a choice the product still offers — a stale id would
-        // resolve to no variant and block the cart just as silently.
-        const carried: StoreOptionSelection = {};
-        if (id === lastLoadedId) {
-          for (const g of optionGroups) {
-            const chosen = s.selection[g.id];
-            if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
+        const id = inputId();
+        // Storage problems must not prevent browsing or buying a product.
+        let saved = false;
+        try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
+        s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
+        // A fresh navigation into the product resets any quantity left over
+        // from a previous visit to the same worker instance.
+        if (!id) {
+          lastProduct = undefined;
+          lastLoadedId = undefined;
+          return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
+        }
+        // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
+        // of after it — it used to add a whole cart round trip before the page could paint.
+        const cartCount = cartItemCount();
+        // The badge must never hold the page: remember the count if it is already in, and
+        // publish it separately if it lands after the product (#3468 review).
+        let cartKnown: number | undefined;
+        void cartCount.then((n) => { cartKnown = n; }, () => {});
+        // The live product read goes out FIRST too — the local-db read below must never delay it.
+        // Settled into a value so a failure is handled where it is awaited, never unhandled.
+        // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
+        const live = getStoreProduct(id, ["DESCRIPTION"]).then(
+          (r) => ({ ok: true as const, r }),
+          () => ({ ok: false as const }),
+        );
+        // Paint at once from the row the list already synced (name, price, image) — the page used
+        // to sit on its skeleton for the product round trip even when the list had just shown it.
+        // The live read then fills in the description and gallery.
+        const synced = await readCachedProduct(id);
+        let painted = false;
+        if (synced && s.status === "loading") {
+          await svc.paintCached(synced);
+          painted = true;
+        }
+        const outcome = await live;
+        if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
+        // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
+        // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
+        // they did — overwriting it would untick a stored save, reset the quantity, and drop the
+        // in-flight add's `adding` guard (a second tap would add the line twice).
+        const base: S = painted ? (svc.getState() as S) : s;
+        const keep = painted
+          ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
+          : { cartHint: "", quantity: 1 };
+        const badge = (): number => {
+          if (painted && (base.adding || base.added)) return base.cartCount;
+          if (cartKnown !== undefined) return cartKnown;
+          const epoch = cartBadgeEpoch;
+          void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
+          return base.cartCount;
+        };
+        if (outcome.ok) {
+          const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
+          const name = cleanTitle(p.name) || "Product";
+          const image = productImage(p, WIX_DETAIL_IMAGE);
+          lastProduct = p;
+          // A group with exactly one choice is chosen for the shopper; a real choice
+          // is left blank so the pick is deliberate.
+          const optionGroups = productOptions(p);
+          const sale = productSale(p);
+          // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
+          // trip to the cart and back silently clears the size the shopper picked and
+          // re-disables the CTA with no explanation. Carry the picks when this is the SAME
+          // product, and only for a choice the product still offers — a stale id would
+          // resolve to no variant and block the cart just as silently.
+          const carried: StoreOptionSelection = {};
+          if (id === lastLoadedId) {
+            for (const g of optionGroups) {
+              const chosen = s.selection[g.id];
+              if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
+            }
           }
+          lastLoadedId = id;
+          return derive({
+            ...base,
+            ...keep,
+            status: "ready",
+            optionGroups,
+            selection: { ...defaultSelection(optionGroups), ...carried },
+            optionsUnknown: false,
+            name,
+            ...sale,
+            commercePrice: sale.price,
+            skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
+            returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+            shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+            ...productBody(p),
+            image,
+            gallery: productGallery(p),
+            initial: (name[0] || "#").toUpperCase(),
+            shareUrl: productShareUrl(p),
+            cartCount: badge(),
+            emptyText: "",
+          });
+        }
+        // Offline: fall back to the last-synced cached product row before the error state.
+        if (synced) {
+          const name = String(synced.name ?? "") || "Product";
+          const image = String(synced.image ?? "");
+          // The cached list row carries no options, and guessing "none" would offer
+          // a one-tap Add to cart for a product that needs a colour and a size. So
+          // the offline detail shows no picker AND marks the options UNKNOWN, which
+          // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
+          // refuses. `cartHint` carries the reason, because the options card is hidden
+          // on `noOptions` and would otherwise leave a dead button unexplained.
+          lastProduct = undefined;
+          lastLoadedId = undefined;
+          return derive({
+            ...base,
+            ...keep,
+            status: "ready",
+            optionGroups: [],
+            selection: {},
+            optionsUnknown: true,
+            name,
+            price: String(synced.subtitle ?? ""),
+            wasPrice: "",
+            skuLabel: "",
+            returnPolicyBody: "",
+            shippingInfoBody: "",
+            description: "",
+            descriptionJson: "",
+            image,
+            initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
+            cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
+            cartCount: badge(),
+            emptyText: "",
+          });
         }
-        lastLoadedId = id;
-        return derive({
-          ...base,
-          ...keep,
-          status: "ready",
-          optionGroups,
-          selection: { ...defaultSelection(optionGroups), ...carried },
-          optionsUnknown: false,
-          name,
-          ...sale,
-          commercePrice: sale.price,
-          skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
-          returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-          shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-          ...productBody(p),
-          image,
-          gallery: productGallery(p),
-          initial: (name[0] || "#").toUpperCase(),
-          shareUrl: productShareUrl(p),
-          cartCount: badge(),
-          emptyText: "",
-        });
-      }
-      // Offline: fall back to the last-synced cached product row before the error state.
-      if (synced) {
-        const name = String(synced.name ?? "") || "Product";
-        const image = String(synced.image ?? "");
-        // The cached list row carries no options, and guessing "none" would offer
-        // a one-tap Add to cart for a product that needs a colour and a size. So
-        // the offline detail shows no picker AND marks the options UNKNOWN, which
-        // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
-        // refuses. `cartHint` carries the reason, because the options card is hidden
-        // on `noOptions` and would otherwise leave a dead button unexplained.
         lastProduct = undefined;
         lastLoadedId = undefined;
-        return derive({
-          ...base,
-          ...keep,
-          status: "ready",
-          optionGroups: [],
-          selection: {},
-          optionsUnknown: true,
-          name,
-          price: String(synced.subtitle ?? ""),
-          wasPrice: "",
-          skuLabel: "",
-          returnPolicyBody: "",
-          shippingInfoBody: "",
-          description: "",
-          descriptionJson: "",
-          image,
-          initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
-          cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
-          cartCount: badge(),
-          emptyText: "",
-        });
-      }
-      lastProduct = undefined;
-      lastLoadedId = undefined;
-      return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
+        return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
+      });
     },
     // The stepper fires onChange with { value } on every tap; clamp 1–99 and
     // ignore unparsable/garbage args instead of silently zeroing the quantity.