@wix/himalaya-cli 0.1320.0 → 0.1321.0

package/templates/branded-lite/tier5-src/himi-branded-lite-programs/index.ts

@@ -7,16 +7,17 @@
 // screen; enrolling stays a hosted-site flow.
 // Four-state (loading / error / rows / empty) like the sibling branded workers.
 //
-// App Store prices come from the shared IAP catalog layer (@himalaya/iap). Until a mapping backend
-// is connected it is disabled, and this worker runs exactly its pre-pricing path.
+// App Store prices come from the shared IAP catalog layer (@himalaya/iap). An app that sells nothing
+// through the App Store reads every program as `disabled` and shows no price line.
 import { defineService as register } from "@himalaya/state";
 import { decorateCollection } from "../_shared/collection-service.js";
 import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
-import { createIapCatalogPricing, iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
+import { iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
+import { createIapCommerce } from "@himalaya/iap-checkout";
 import { wixMediaUrl } from "@himalaya/wix-media";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
-import { hostIapScope, hostScopeComplete, iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
+import { iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 
 const SERVICE = "himiBrandedPrograms";
 
@@ -133,10 +134,6 @@ function programFields(p: WixProgram): Omit<ProgramRow, "priceLine"> {
   };
 }
 
-function programRow(p: WixProgram): ProgramRow {
-  return { ...programFields(p), priceLine: "" };
-}
-
 function programContent(p: WixProgram): ProgramContent {
   return { ...programFields(p), wixId: p.id ?? "" };
 }
@@ -177,28 +174,22 @@ async function fetchPrograms(): Promise<WixProgram[]> {
   return (response.programs ?? []).filter((p) => !isDraft(p));
 }
 
-async function load(state: State, arg?: unknown): Promise<State> {
-  stashCopy(arg);
-  try {
-    return ready((await fetchPrograms()).map(programRow));
-  } catch {
-    return errored(state);
-  }
-}
-
-// ── App Store pricing (enabled only when a mapping backend is connected) ─────
+// ── Content and App Store prices ─────
 //
-// One writer: `loadPriced` keeps its content here and every state change goes through the
+// One writer: `load` keeps its content here and every state change goes through the
 // synchronous `pricingPublish`, which re-reads the latest content and prices. An async action
 // that returned its own state could land after a newer publication and repaint stale prices.
 
-const pricing = createIapCatalogPricing({ onChange: () => { void svc.pricingPublish(); } });
+// Prices only: the list sells nothing (each card opens the program, whose screen owns the sale),
+// so its composition has no adapters and never starts a checkout.
+const commerce = createIapCommerce({ onChange: () => { void svc.pricingPublish(); } });
+const pricing = commerce.pricing;
 const PRICING_NOT_HYDRATED = ["rows", "collection", "hidePriceRetry"] as const;
 let content: { status: State["status"]; programs: ProgramContent[] } = { status: "loading", programs: [] };
 let scopeIncomplete = false;
 let loadSeq = 0;
 
-async function loadPriced(_state: State, arg?: unknown): Promise<undefined> {
+async function load(_state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
   const seq = ++loadSeq;
   const programs = await fetchPrograms().catch(() => undefined);
@@ -212,12 +203,10 @@ async function loadPriced(_state: State, arg?: unknown): Promise<undefined> {
 /** Prices the programs on screen now. Content never waits on this, and the host scope is re-read
  *  each time, so a failed app-info read recovers on the next refresh. */
 async function priceContent(): Promise<void> {
-  // The Retry action is declared in both modes; with no backend it must not reach the host.
-  if (!pricing.enabled) return;
-  const host = await hostIapScope();
-  scopeIncomplete = !hostScopeComplete(host);
   if (content.status !== "ready") return;
-  await pricing.load({ ...host, items: content.programs.flatMap((program) => onlineProgramItem({ id: program.wixId }) ?? []) });
+  const items = content.programs.flatMap((program) => onlineProgramItem({ id: program.wixId }) ?? []);
+  scopeIncomplete = !(await commerce.loadPrices(items)).scopeComplete;
+  void svc.pricingPublish();
 }
 
 function pricedState(state: State): State {
@@ -232,7 +221,8 @@ function pricedState(state: State): State {
   return {
     ...state, ...shown, programs: content.programs,
     // Retry re-prices the programs on screen, which only a ready list has.
-    hidePriceRetry: content.status !== "ready" || !views.some((view) => view && (scopeIncomplete || view.retryable)),
+    // `disabled`: this app sells nothing through the App Store, so there is no price lookup to retry.
+    hidePriceRetry: content.status !== "ready" || !views.some((view) => view && view.route !== "disabled" && (scopeIncomplete || view.retryable)),
     priceRetryText: copyParam("programs.priceRetryText", "Some prices could not be loaded."),
   };
 }
@@ -260,7 +250,7 @@ type Actions = {
 };
 
 const actions: Actions = {
-  load: pricing.enabled ? loadPriced : load,
+  load,
   pricingPublish: pricedState,
   pricingStart: (state) => ({ ...pricedState(state), _poll: pricing.pollDirective(`${SERVICE}.pricingRefresh`) }),
   pricingRefresh: async () => { await priceContent(); return undefined; },
@@ -269,18 +259,14 @@ const actions: Actions = {
 // The collection decorator's own `defineService` drops `notHydrated`, so the decorated definition
 // is registered directly: this run's prices must never be restored from a cold-boot snapshot.
 const decorated = decorateCollection(SERVICE, { state: INITIAL_STATE, actions } as unknown as Parameters<typeof decorateCollection>[1]);
-const svc = register<State, Actions>(SERVICE, (pricing.enabled
-  ? { ...decorated, notHydrated: [...PRICING_NOT_HYDRATED] }
-  : decorated) as unknown as Parameters<typeof register<State, Actions>>[1]);
+const svc = register<State, Actions>(SERVICE, { ...decorated, notHydrated: [...PRICING_NOT_HYDRATED] } as unknown as Parameters<typeof register<State, Actions>>[1]);
 
-if (pricing.enabled) {
-  const booted = svc.getState();
-  if ((booted.status === "ready" || booted.status === "error") && Array.isArray(booted.programs)) {
-    content = { status: booted.status, programs: booted.programs };
-  }
-  resetUnhydratedKeysOnOlderRuntime(svc, decorated.state as unknown as State, PRICING_NOT_HYDRATED);
-  void svc.pricingStart();
+const booted = svc.getState();
+if ((booted.status === "ready" || booted.status === "error") && Array.isArray(booted.programs)) {
+  content = { status: booted.status, programs: booted.programs };
 }
+resetUnhydratedKeysOnOlderRuntime(svc, decorated.state as unknown as State, PRICING_NOT_HYDRATED);
+void svc.pricingStart();
 
 // Kick the first load at module scope, like every other list bundle
 // (himi-store-shop, himi-booking-services, himi-events-list, himi-blog-feed …).

package/templates/yoga-studio/dev/index.ts

@@ -25845,6 +25845,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "actionId": "tier5.himiBrandedProgram.enroll"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.enrollHidden"
                       }
                     },
                     {
@@ -25858,6 +25861,44 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "color": "textSecondary",
                           "collapseWhenEmpty": true
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.enrollHidden"
+                      }
+                    },
+                    {
+                      "id": "himi_program.buy",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "$service:himiBrandedProgram.buyLabel",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "disabledPath": "$service:himiBrandedProgram.buyDisabled",
+                          "action": {
+                            "actionId": "tier5.himiBrandedProgram.buy"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.buyHidden"
+                      }
+                    },
+                    {
+                      "id": "himi_program.buy_note",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedProgram.buyNote",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.buyHidden"
                       }
                     },
                     {

package/templates/yoga-studio/tier5-src/_shared/iap-worker.ts

@@ -1,49 +1,11 @@
-// Worker-side glue for the shared IAP catalog layer (`@himalaya/iap` → createIapCatalogPricing),
-// shared by every screen that shows or sells an IAP-backed item. Mapping, Apple prices and payment
-// guards live in the SDK; this only supplies the host scope, the copy, and the hydration reset.
-import { get as appInfo } from "@himalaya/app-info";
-import type { IapCatalogScope, IapPriceCopy } from "@himalaya/iap";
+// Worker-side glue for the shared IAP layer (`@himalaya/iap` catalog pricing and
+// `@himalaya/iap-checkout` → createIapCommerce), shared by every screen that shows or sells an
+// IAP-backed item. Mapping, Apple prices, payment guards, the host scope and the sale live in the
+// SDK; this only supplies the copy and the hydration reset.
+import type { IapPriceCopy } from "@himalaya/iap";
+import type { IapPurchaseCopy } from "@himalaya/iap-checkout";
 import { copyParam } from "./himi-copy.js";
 
-export interface HostIapScope {
-  scope: IapCatalogScope;
-  platform: string;
-}
-
-let hostScope: Promise<HostIapScope> | undefined;
-
-/** Read once per worker, and only by an enabled screen: a disabled one makes no app-info call.
- *  App identity and platform come from the host, never a screen param. The site is the host-owned
- *  native preference business (the web partition uses an OAuth client ID); without one, the mapping source's
- *  bound site applies. A failed read leaves identity empty, which fails every item closed — and is
- *  not kept, so the next lookup asks the host again instead of staying invalid for good. */
-export function hostIapScope(): Promise<HostIapScope> {
-  return hostScope ??= readHostScope().then((read) => {
-    if (!hostScopeComplete(read)) hostScope = undefined;
-    return read;
-  });
-}
-
-/** An incomplete scope prices every item `invalidInput`, which the shared layer never offers to
- *  retry — so a screen offers Retry itself while its own host read is what failed. */
-export function hostScopeComplete(read: HostIapScope): boolean {
-  return !!read.scope.appId && !!read.scope.bundleId && !!read.platform;
-}
-
-async function readHostScope(): Promise<HostIapScope> {
-  const identity = await appInfo().catch(() => undefined);
-  const siteId = identity?.platform === "web" ? "" : hostSiteId();
-  return {
-    scope: { appId: identity?.appId ?? "", bundleId: identity?.bundleId ?? "", ...(siteId ? { siteId } : {}) },
-    platform: identity?.platform ?? "",
-  };
-}
-
-function hostSiteId(): string {
-  const value = (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.__himiPreferenceBusiness;
-  return typeof value === "string" ? value.trim() : "";
-}
-
 /** Price labels from the screen's copy pack (`<prefix>.priceLoadingText`, …). */
 export function iapPriceCopy(prefix: string): IapPriceCopy {
   return {
@@ -54,6 +16,21 @@ export function iapPriceCopy(prefix: string): IapPriceCopy {
   };
 }
 
+/** App Store purchase labels from the screen's copy pack (`<prefix>.buyCta`, …), for
+ *  `iapPurchaseFields`. Customer copy only: no backend names, ids or diagnostics. */
+export function iapPurchaseCopy(prefix: string): IapPurchaseCopy {
+  return {
+    buy: copyParam(`${prefix}.buyCta`, "Get access"),
+    processing: copyParam(`${prefix}.purchaseProcessingText`, "Processing your purchase…"),
+    awaitingApproval: copyParam(`${prefix}.purchaseAwaitingApprovalText`, "Waiting for approval"),
+    unavailable: copyParam(`${prefix}.purchaseTemporarilyUnavailableText`, "Purchasing is temporarily unavailable."),
+    signInRequired: copyParam(`${prefix}.purchaseSignInText`, "Sign in to buy."),
+    retry: copyParam(`${prefix}.purchaseRetryText`, "Something went wrong. Try again."),
+    priceChanged: copyParam(`${prefix}.purchasePriceChangedText`, "The price changed. Check it and try again."),
+    support: copyParam(`${prefix}.purchaseSupportText`, "We couldn't finish this purchase. Contact support."),
+  };
+}
+
 /** What `notHydrated` does, for a runtime that ignores the option (a binary older than it, still
  *  served new bundles): put the listed keys back to their declared values before any action runs,
  *  so a persisted price or an enabled purchase action never paints as this run's. */

package/templates/yoga-studio/tier5-src/himi-branded-lite-program/index.ts

@@ -14,8 +14,11 @@
 // back APPROVAL_PENDING (the owner approves; there is nothing to charge). Any failure
 // degrades to the site-directing message rather than a dead button.
 //
-// App Store prices and the payment route come from the shared IAP catalog layer (@himalaya/iap).
-// Until a mapping backend is connected it is disabled, and this worker runs its pre-pricing path.
+// App Store prices, the payment route and the App Store sale come from the shared IAP layer
+// (`createIapCommerce` in @himalaya/iap-checkout). An app that sells nothing through the App Store
+// reads every program as `disabled` and keeps Enrol on its own commerce. An Apple-routed program
+// offers Get access in place of Enrol and sells only through the shared checkout, never through the
+// Wix payment rail.
 import { defineService } from "@himalaya/state";
 import {
   getProgram,
@@ -31,8 +34,9 @@ import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { payCashierOrder } from "@himalaya/checkout";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { createIapCatalogPricing, iapPriceFields, onlineProgramItem, type IapCatalogItem, type IapPollDirective, type IapPriceFields } from "@himalaya/iap";
-import { hostIapScope, hostScopeComplete, iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
+import { iapPriceFields, onlineProgramItem, type IapCatalogItem, type IapPollDirective, type IapPriceFields } from "@himalaya/iap";
+import { createIapCommerce, onlineProgramOrders, type IapPurchaseFields } from "@himalaya/iap-checkout";
+import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 
 /** Wix Online Programs appDefId — the vertical a participant's cashier order is
  *  paid under (mirrors AppDefId.CHALLENGES in Wix's RN apps). */
@@ -66,6 +70,13 @@ interface State {
   /** Bound to the Enrol CTA's `disabledPath`; `enroll` re-checks the route itself regardless. */
   enrollDisabled: boolean;
   enrollNote: string;
+  /** An App Store program sells through Get access instead. */
+  enrollHidden: boolean;
+  /** The shared checkout's action (`commerce.purchaseFields`): shown only on the App Store route. */
+  buyHidden: boolean;
+  buyLabel: string;
+  buyDisabled: boolean;
+  buyNote: string;
   _poll?: IapPollDirective;
 }
 
@@ -174,15 +185,6 @@ async function fetchProgram(id: string): Promise<WixProgram | undefined> {
   }
 }
 
-async function load(state: State, arg?: unknown): Promise<State> {
-  stashCopy(arg);
-  try {
-    return ready(state, await fetchProgram(inputId()));
-  } catch {
-    return derive({ ...state, status: "error" });
-  }
-}
-
 /** Whether the existing commerce flow may start (before the join) and continue (before the Wix
  *  payment): a price refresh can move the program onto a route this flow must not charge. */
 interface CommerceGuards {
@@ -190,8 +192,6 @@ interface CommerceGuards {
   mayContinue(): boolean;
 }
 
-const ALWAYS_ALLOWED: CommerceGuards = { mayStart: () => true, mayContinue: () => true };
-
 async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<string> {
   const blocked = () => iapPriceCopy("program").purchaseUnavailable;
   if (!guards.mayStart()) return blocked();
@@ -251,27 +251,27 @@ async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<
   return copyTemplate("program.joinOnSiteMessage", "Enrolment happens on the website — visit the site to join {name}.", { name });
 }
 
-async function enroll(state: State): Promise<State> {
-  if (!inputId()) return state;
-  return derive({ ...state, actionMessage: await enrollmentMessage(state.name, ALWAYS_ALLOWED) });
-}
-
-// ── App Store pricing (enabled only when a mapping backend is connected) ─────
+// ── Content, App Store pricing and sale ─────
 //
-// One writer: `loadPriced` and `enrollPriced` keep their results here and every state change goes
-// through the synchronous `pricingPublish`, which re-reads the latest content and route. An async
-// action returning its own state could land after a refresh and revive a stale price or route.
+// One writer: `load`, `enroll` and `buy` keep their results here and every state
+// change goes through the synchronous `pricingPublish`, which re-reads the latest content, route
+// and checkout state. An async action returning its own state could land after a refresh and
+// revive a stale price, route or purchase.
 
-const pricing = createIapCatalogPricing({ onChange: () => { void svc.pricingPublish(); } });
-const PRICING_NOT_HYDRATED = ["priceLine", "priceNote", "hidePriceRetry", "enrollDisabled", "enrollNote"] as const;
+const commerce = createIapCommerce({ adapters: [onlineProgramOrders], onChange: () => { void svc.pricingPublish(); } });
+const pricing = commerce.pricing;
+const PRICING_NOT_HYDRATED = [
+  "priceLine", "priceNote", "hidePriceRetry", "enrollDisabled", "enrollNote", "enrollHidden", "buyHidden", "buyLabel", "buyDisabled", "buyNote",
+] as const;
 const CONTENT_KEYS = ["status", "name", "description", "meta", "image", "initial", "emptyText"] as const;
 type Content = Pick<State, (typeof CONTENT_KEYS)[number]>;
 const NO_PRICE: IapPriceFields = { priceText: "", priceNote: "", priceLoading: false, hidePriceRetry: true, actionDisabled: true, actionNote: "" };
+const NOT_APPLE: IapPurchaseFields = { appleRoute: false, accessReady: false, buyLabel: "", buyDisabled: true, buyBusy: false, buyNote: "" };
 let content: Content;
 let pricedItem: IapCatalogItem | undefined;
-let scopeIncomplete = false;
 let actionMessage = "";
 let loadSeq = 0;
+let commerceStarted = false;
 
 function contentOf(state: State): Content {
   return Object.fromEntries(CONTENT_KEYS.map((key) => [key, state[key]])) as Content;
@@ -279,7 +279,7 @@ function contentOf(state: State): Content {
 
 const programReference = () => onlineProgramItem({ id: inputId() })?.reference;
 
-async function loadPriced(state: State, arg?: unknown): Promise<undefined> {
+async function load(state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
   const seq = ++loadSeq;
   const found = await fetchProgram(inputId()).then((program) => ({ program }), () => undefined);
@@ -288,20 +288,27 @@ async function loadPriced(state: State, arg?: unknown): Promise<undefined> {
   pricedItem = found?.program ? onlineProgramItem({ id: inputId() }, priceOf(found.program)) : pricedItem;
   void svc.pricingPublish();
   if (found?.program) void priceProgram();
+  void resumeCommerce();
   return undefined;
 }
 
+/** First entry recovers held purchases; every later one (a return to the screen) reconciles. */
+async function resumeCommerce(): Promise<void> {
+  const first = !commerceStarted;
+  commerceStarted = true;
+  await (first ? commerce.start() : commerce.reconcile());
+  void svc.pricingPublish();
+}
+
 /** Content never waits on this, and the host scope is re-read each time, so a failed app-info
  *  read recovers on the next refresh. */
 async function priceProgram(): Promise<void> {
-  // The Retry action is declared in both modes; with no backend it must not reach the host.
-  if (!pricing.enabled) return;
-  const host = await hostIapScope();
-  scopeIncomplete = !hostScopeComplete(host);
-  if (pricedItem) await pricing.load({ ...host, items: [pricedItem] });
+  if (!pricedItem) return;
+  await commerce.loadPrices([pricedItem]);
+  void svc.pricingPublish();
 }
 
-async function enrollPriced(): Promise<undefined> {
+async function enroll(): Promise<undefined> {
   const reference = programReference();
   if (!reference) return undefined;
   // A tap that lands as a refresh starts is refused without a verdict: the route is unknown, not
@@ -314,13 +321,29 @@ async function enrollPriced(): Promise<undefined> {
   return undefined;
 }
 
+/** The App Store sale: only through the shared checkout, and only for the route the price shows. */
+async function buy(): Promise<undefined> {
+  const reference = programReference();
+  if (!reference) return undefined;
+  await commerce.buy({ reference });
+  void svc.pricingPublish();
+  return undefined;
+}
+
 function pricedState(state: State): State {
   const reference = programReference();
-  const price = reference ? iapPriceFields(pricing.view(reference), iapPriceCopy("program")) : NO_PRICE;
+  const view = reference && pricing.view(reference);
+  const price = view ? iapPriceFields(view, iapPriceCopy("program")) : NO_PRICE;
+  const purchase = reference ? commerce.purchaseFields(reference, iapPurchaseCopy("program")) : NOT_APPLE;
+  const poll = commerce.pollDirective("himiBrandedProgram.iapPoll");
   return derive({
-    ...state, ...content, actionMessage,
-    priceLine: price.priceText, priceNote: price.priceNote, hidePriceRetry: price.hidePriceRetry && !scopeIncomplete,
-    enrollDisabled: price.actionDisabled, enrollNote: price.actionNote,
+    ...state, ...content,
+    actionMessage: purchase.accessReady ? copyTemplate("program.joinedMessage", "You're enrolled in {name}.", { name: content.name }) : actionMessage,
+    // `disabled`: this app sells nothing through the App Store, so the program shows its own price.
+    priceLine: view?.route === "disabled" ? pricedItem?.commerceDisplayPrice ?? "" : price.priceText, priceNote: price.priceNote, hidePriceRetry: view?.route === "disabled" || (price.hidePriceRetry && commerce.scopeComplete()),
+    enrollDisabled: price.actionDisabled, enrollNote: price.actionNote, enrollHidden: purchase.appleRoute,
+    buyHidden: !purchase.appleRoute || purchase.accessReady, buyLabel: purchase.buyLabel, buyDisabled: purchase.buyDisabled, buyNote: purchase.buyNote,
+    ...(poll ? { _poll: poll } : {}),
   });
 }
 
@@ -344,34 +367,41 @@ const INITIAL_STATE: State = derive({
   hideContent: true,
   priceNote: "",
   hidePriceRetry: true,
-  enrollDisabled: pricing.enabled,
+  enrollDisabled: true,
   enrollNote: "",
+  enrollHidden: false,
+  buyHidden: true,
+  buyLabel: "",
+  buyDisabled: true,
+  buyNote: "",
 });
 
 type Actions = {
   load: (state: State, arg?: unknown) => Promise<State | undefined>;
   enroll: (state: State) => Promise<State | undefined>;
+  buy: (state: State) => Promise<State | undefined>;
   pricingPublish: (state: State) => State;
   pricingStart: (state: State) => State;
   pricingRefresh: (state: State) => Promise<undefined>;
+  iapPoll: (state: State) => Promise<undefined>;
 };
 
 const svc = defineService<State, Actions>("himiBrandedProgram", {
   state: INITIAL_STATE,
-  ...(pricing.enabled ? { notHydrated: [...PRICING_NOT_HYDRATED] } : {}),
+  notHydrated: [...PRICING_NOT_HYDRATED],
   actions: {
-    load: pricing.enabled ? loadPriced : load,
-    enroll: pricing.enabled ? enrollPriced : enroll,
+    load,
+    enroll,
+    buy,
     pricingPublish: pricedState,
-    pricingStart: (state) => ({ ...pricedState(state), _poll: pricing.pollDirective("himiBrandedProgram.pricingRefresh") }),
+    pricingStart: pricedState,
     pricingRefresh: async () => { await priceProgram(); return undefined; },
+    iapPoll: async () => { await commerce.poll(); void svc.pricingPublish(); return undefined; },
   },
 });
 
 content = contentOf(svc.getState());
-if (pricing.enabled) {
-  resetUnhydratedKeysOnOlderRuntime(svc, INITIAL_STATE, PRICING_NOT_HYDRATED);
-  void svc.pricingStart();
-}
+resetUnhydratedKeysOnOlderRuntime(svc, INITIAL_STATE, PRICING_NOT_HYDRATED);
+void svc.pricingStart();
 
 export { svc };

package/templates/yoga-studio/tier5-src/himi-branded-lite-programs/index.ts

@@ -7,16 +7,17 @@
 // screen; enrolling stays a hosted-site flow.
 // Four-state (loading / error / rows / empty) like the sibling branded workers.
 //
-// App Store prices come from the shared IAP catalog layer (@himalaya/iap). Until a mapping backend
-// is connected it is disabled, and this worker runs exactly its pre-pricing path.
+// App Store prices come from the shared IAP catalog layer (@himalaya/iap). An app that sells nothing
+// through the App Store reads every program as `disabled` and shows no price line.
 import { defineService as register } from "@himalaya/state";
 import { decorateCollection } from "../_shared/collection-service.js";
 import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
-import { createIapCatalogPricing, iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
+import { iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
+import { createIapCommerce } from "@himalaya/iap-checkout";
 import { wixMediaUrl } from "@himalaya/wix-media";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
-import { hostIapScope, hostScopeComplete, iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
+import { iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 
 const SERVICE = "himiBrandedPrograms";
 
@@ -133,10 +134,6 @@ function programFields(p: WixProgram): Omit<ProgramRow, "priceLine"> {
   };
 }
 
-function programRow(p: WixProgram): ProgramRow {
-  return { ...programFields(p), priceLine: "" };
-}
-
 function programContent(p: WixProgram): ProgramContent {
   return { ...programFields(p), wixId: p.id ?? "" };
 }
@@ -177,28 +174,22 @@ async function fetchPrograms(): Promise<WixProgram[]> {
   return (response.programs ?? []).filter((p) => !isDraft(p));
 }
 
-async function load(state: State, arg?: unknown): Promise<State> {
-  stashCopy(arg);
-  try {
-    return ready((await fetchPrograms()).map(programRow));
-  } catch {
-    return errored(state);
-  }
-}
-
-// ── App Store pricing (enabled only when a mapping backend is connected) ─────
+// ── Content and App Store prices ─────
 //
-// One writer: `loadPriced` keeps its content here and every state change goes through the
+// One writer: `load` keeps its content here and every state change goes through the
 // synchronous `pricingPublish`, which re-reads the latest content and prices. An async action
 // that returned its own state could land after a newer publication and repaint stale prices.
 
-const pricing = createIapCatalogPricing({ onChange: () => { void svc.pricingPublish(); } });
+// Prices only: the list sells nothing (each card opens the program, whose screen owns the sale),
+// so its composition has no adapters and never starts a checkout.
+const commerce = createIapCommerce({ onChange: () => { void svc.pricingPublish(); } });
+const pricing = commerce.pricing;
 const PRICING_NOT_HYDRATED = ["rows", "collection", "hidePriceRetry"] as const;
 let content: { status: State["status"]; programs: ProgramContent[] } = { status: "loading", programs: [] };
 let scopeIncomplete = false;
 let loadSeq = 0;
 
-async function loadPriced(_state: State, arg?: unknown): Promise<undefined> {
+async function load(_state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
   const seq = ++loadSeq;
   const programs = await fetchPrograms().catch(() => undefined);
@@ -212,12 +203,10 @@ async function loadPriced(_state: State, arg?: unknown): Promise<undefined> {
 /** Prices the programs on screen now. Content never waits on this, and the host scope is re-read
  *  each time, so a failed app-info read recovers on the next refresh. */
 async function priceContent(): Promise<void> {
-  // The Retry action is declared in both modes; with no backend it must not reach the host.
-  if (!pricing.enabled) return;
-  const host = await hostIapScope();
-  scopeIncomplete = !hostScopeComplete(host);
   if (content.status !== "ready") return;
-  await pricing.load({ ...host, items: content.programs.flatMap((program) => onlineProgramItem({ id: program.wixId }) ?? []) });
+  const items = content.programs.flatMap((program) => onlineProgramItem({ id: program.wixId }) ?? []);
+  scopeIncomplete = !(await commerce.loadPrices(items)).scopeComplete;
+  void svc.pricingPublish();
 }
 
 function pricedState(state: State): State {
@@ -232,7 +221,8 @@ function pricedState(state: State): State {
   return {
     ...state, ...shown, programs: content.programs,
     // Retry re-prices the programs on screen, which only a ready list has.
-    hidePriceRetry: content.status !== "ready" || !views.some((view) => view && (scopeIncomplete || view.retryable)),
+    // `disabled`: this app sells nothing through the App Store, so there is no price lookup to retry.
+    hidePriceRetry: content.status !== "ready" || !views.some((view) => view && view.route !== "disabled" && (scopeIncomplete || view.retryable)),
     priceRetryText: copyParam("programs.priceRetryText", "Some prices could not be loaded."),
   };
 }
@@ -260,7 +250,7 @@ type Actions = {
 };
 
 const actions: Actions = {
-  load: pricing.enabled ? loadPriced : load,
+  load,
   pricingPublish: pricedState,
   pricingStart: (state) => ({ ...pricedState(state), _poll: pricing.pollDirective(`${SERVICE}.pricingRefresh`) }),
   pricingRefresh: async () => { await priceContent(); return undefined; },
@@ -269,18 +259,14 @@ const actions: Actions = {
 // The collection decorator's own `defineService` drops `notHydrated`, so the decorated definition
 // is registered directly: this run's prices must never be restored from a cold-boot snapshot.
 const decorated = decorateCollection(SERVICE, { state: INITIAL_STATE, actions } as unknown as Parameters<typeof decorateCollection>[1]);
-const svc = register<State, Actions>(SERVICE, (pricing.enabled
-  ? { ...decorated, notHydrated: [...PRICING_NOT_HYDRATED] }
-  : decorated) as unknown as Parameters<typeof register<State, Actions>>[1]);
+const svc = register<State, Actions>(SERVICE, { ...decorated, notHydrated: [...PRICING_NOT_HYDRATED] } as unknown as Parameters<typeof register<State, Actions>>[1]);
 
-if (pricing.enabled) {
-  const booted = svc.getState();
-  if ((booted.status === "ready" || booted.status === "error") && Array.isArray(booted.programs)) {
-    content = { status: booted.status, programs: booted.programs };
-  }
-  resetUnhydratedKeysOnOlderRuntime(svc, decorated.state as unknown as State, PRICING_NOT_HYDRATED);
-  void svc.pricingStart();
+const booted = svc.getState();
+if ((booted.status === "ready" || booted.status === "error") && Array.isArray(booted.programs)) {
+  content = { status: booted.status, programs: booted.programs };
 }
+resetUnhydratedKeysOnOlderRuntime(svc, decorated.state as unknown as State, PRICING_NOT_HYDRATED);
+void svc.pricingStart();
 
 // Kick the first load at module scope, like every other list bundle
 // (himi-store-shop, himi-booking-services, himi-events-list, himi-blog-feed …).