@wix/himalaya-cli 0.1034.0 → 0.1036.0

package/templates/branded-lite/tier5-src/_shared/collection-contract.ts

@@ -26,6 +26,13 @@ export interface CollectionConfig {
   reviewSelectedAction?: string;
   /** Optional comfortable grid media height for immersive visual catalogs. */
   gridImageHeight?: number;
+  /** What the count summary counts — ["dish", "dishes"] reads "12 dishes". Default "item(s)". */
+  countNoun?: [string, string];
+  /** Phone grid columns (default 2). A card carrying a paragraph of benefits and a CTA — a
+   *  pricing plan — is unreadable at half width, so it opts into one. */
+  gridColumns?: number;
+  /** Lines of the meta caption a comfortable row may use (default 2). */
+  metaMaxLines?: number;
   /** The card's primary verb, shown as a visible button beside the overflow.
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
@@ -38,28 +45,28 @@ export interface CollectionConfig {
  * page, the list/grid toggle, Refine, chips, search and count are noise. */
 export const COLLECTION_CHROME_MIN_ITEMS = 4;
 export const COLLECTIONS: Record<string, CollectionConfig> = {
-  himiStoreShop: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', view: 'grid', backendQuery: true },
-  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Service name starts with…', primaryVerb: { label: 'Book', screenId: 'himi_time' } },
+  himiStoreShop: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
+  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Search services', countNoun: ['service', 'services'], primaryVerb: { label: 'Book', screenId: 'himi_time' } },
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
-    defaultFilter: 'value:Upcoming', searchPlaceholder: 'Exact booking ID', filterValues: ['Upcoming', 'Past', 'Cancelled'],
+    defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search by booking ID', countNoun: ['booking', 'bookings'], filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
   himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
-  himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true },
+  himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
   himiOwnerLiteServices: { rows: 'services', title: 'name', subtitle: 'subtitle', view: 'list', backendQuery: true, searchPlaceholder: 'Service name starts with…' },
   himiOwnerLiteEvents: { rows: 'events', title: 'title', subtitle: 'dateLine', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' } },
   himiOwnerLitePosts: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', view: 'grid' },
-  himiOwnerLiteOrders: { rows: 'orders', title: 'buyer', subtitle: 'meta', filter: 'statusLabel', view: 'list', backendQuery: true,
+  himiOwnerLiteOrders: { rows: 'orders', title: 'buyer', subtitle: 'meta', filter: 'statusLabel', view: 'list', backendQuery: true, countNoun: ['order', 'orders'],
     searchPlaceholder: 'Customer name, email or order #', sortLabels: { default: 'Newest', az: 'Customer A–Z', za: 'Customer Z–A' },
     filterValues: ['Recent 7 days', 'Paid', 'Unpaid', 'Partially paid', 'Pending', 'Refunded', 'Partly refunded'] },
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
-    searchPlaceholder: 'Exact order number', filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
+    searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
-  himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid' },
+  himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
   himiBrandedPrograms: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },
@@ -75,7 +82,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedForms: { rows: 'forms', title: 'name', subtitle: 'description', view: 'list' },
   himiBrandedGalleries: { rows: 'galleries', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedInbox: { rows: 'conversations', title: 'title', subtitle: 'preview', view: 'list' },
-  himiBrandedMenus: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', sectioned: true, filter: 'collectionCategory', metadata: ['collectionCategory', 'priceLine', 'label1', 'label2', 'label3'], view: 'grid' },
+  himiBrandedMenus: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', sectioned: true, filter: 'collectionCategory', metadata: ['collectionCategory', 'priceLine', 'label1', 'label2', 'label3'], view: 'grid', searchPlaceholder: 'Search the menu', countNoun: ['dish', 'dishes'] },
 };
 export interface CollectionPreferences {
   view: 'list' | 'grid';

package/templates/branded-lite/tier5-src/_shared/collection-service.ts

@@ -18,6 +18,20 @@ type Reducer = (s: State, ...args: unknown[]) => State | undefined | Promise<Sta
 const object = (x: unknown): State => x && typeof x === 'object' && !Array.isArray(x) ? x as State : {};
 const str = (arg: unknown, key: string): string => typeof arg === 'string' ? arg : String(object(arg)[key] ?? '');
 
+/** The toolbar count line — "12 dishes", or "3 of 12 dishes" while a filter narrows the list.
+ *
+ *  It used to read "12 / 12 loaded" and "2 / 2 results" ([branded-lite-qa] #3002): the numbers
+ *  described the implementation (a client-side filter over a fetched page) rather than what the
+ *  customer is looking at, and the slash-and-suffix wrapped onto two lines on web. When the
+ *  backend total is unknown the count shown is simply what is shown; the "Load more" button is
+ *  what says there is more. */
+export function collectionSummary(o: { shown: number; loaded: number; total?: number; backend?: boolean; noun?: [string, string] }): string {
+  const [one, many] = o.noun ?? [copyParam('collection.itemOne', 'item'), copyParam('collection.itemMany', 'items')];
+  const whole = o.backend ? (typeof o.total === 'number' ? o.total : o.shown) : o.loaded;
+  const noun = (whole === 1 ? one : many);
+  return o.shown < whole ? `${o.shown} ${copyParam('collection.of', 'of')} ${whole} ${noun}` : `${o.shown} ${o.shown === 1 ? one : many}`;
+}
+
 /** Opt-in decorator. Domain reducers remain authoritative; collection preferences
  * survive reducers which replace their entire state, including async refreshes. */
 export function decorateCollection(name: string, def: { state: State; actions?: Record<string, Reducer> }, saving?: CollectionSaving, backend?: BackendCollection) {
@@ -179,11 +193,11 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       filtersPresented, previewPresented: !!previewId, preview: projected.items.filter(row => row.collectionId === previewId),
       persistenceLabel: persisted.available ? copyParam('collection.onDevice', 'Saved on this device') : copyParam('collection.sessionOnly', 'Choices last for this session'),
       noEmpty: loading || errored || sourceEmpty || domainNarrowed || projected.items.length > 0,
-      summary: backend && config.backendQuery
-        ? (s.fromCache ? copyParam('collection.cached', 'Saved offline · may be outdated')
-          : typeof s.total === 'number' ? `${projected.items.length} / ${s.total} ${copyParam('collection.results', 'results')}`
-          : `${projected.items.length} ${s.complete ? copyParam('collection.results', 'results') : copyParam('collection.loaded', 'loaded')}`)
-        : `${projected.items.length} / ${projected.loaded} ${copyParam('collection.loaded', 'loaded')}`,
+      summary: backend && config.backendQuery && s.fromCache
+        ? copyParam('collection.cached', 'Saved offline · may be outdated')
+        : collectionSummary({ shown: projected.items.length, loaded: projected.loaded, backend: !!(backend && config.backendQuery),
+          total: typeof s.total === 'number' ? s.total : undefined, noun: config.countNoun
+            ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
       chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,

package/templates/branded-lite/tier5-src/_shared/engine-intl.ts

@@ -352,3 +352,54 @@ export function compareDateDesc(a: string, b: string): number {
   if (bBad) return -1;
   return tb - ta;
 }
+
+// --- [branded-lite-qa] #3079: one pattern per fact ---------------------------------------
+//
+// Before these existed, four screens formatted the same money four ways — Shop "69.00 ₪" (Wix's
+// pre-formatted string), Services "₪70" (0 decimals), Menu "₪32.00", Plans "$24" — and two
+// screens formatted the same clock two ways (Events "9:00 PM-11:00 PM", Reserve "20:00").
+// Customers read that as sloppiness, and a whole "₪70" beside "₪69.50" reads as a different
+// kind of number. So: one money pattern, one clock, one range.
+
+// Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
+// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
+// "₪70 · ₪69.50".
+
+const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));
+
+/** Wix hands some prices over PRE-formatted in the site's regional style — "69.00 ₪" with the
+ *  symbol trailing, often wrapped in bidi marks. Reorder those to the house pattern ("₪69.00") so
+ *  they match every price we format ourselves. Only an en-shaped number ("69.00", "1,234.50") with
+ *  a known trailing symbol is reordered: a comma-decimal or space-grouped string ("69,00 €",
+ *  "1 234,56 €") is kept as Wix wrote it, because half-converting it would be worse. Anything else
+ *  ("Market price") is returned trimmed. The store SDK's product price applies the same rule. */
+export function normalizeFormattedPrice(formatted: string): string {
+  const raw = (formatted || "").replace(/[‎‏]/g, "").trim();
+  const m = /^(-?)(\d{1,3}(?:,\d{3})*(?:\.\d+)?|\d+(?:\.\d+)?)[\s  ]*(\S+)$/.exec(raw);
+  if (!m || !KNOWN_SYMBOLS.has(m[3])) return raw;
+  return `${m[1]}${m[3]}${m[2]}`;
+}
+
+function clockParts(d: Date, locale: string): { time: string; meridiem: string } {
+  const full = hasIntl()
+    ? new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "2-digit", hour12: true }).format(d)
+    : clock12(d);
+  // ICU puts a narrow no-break space before the meridiem; normalize so callers can split on it.
+  const clean = full.replace(/[  ]/g, " ");
+  const m = /^(.*?)\s*([AP]\.?M\.?)$/i.exec(clean);
+  return m ? { time: m[1], meridiem: m[2] } : { time: clean, meridiem: "" };
+}
+
+/** "8:00 PM" — the one clock every customer screen uses (12-hour, en-US shape). */
+export function formatClock(date: Date, locale = "en-US"): string {
+  const { time, meridiem } = clockParts(date, locale);
+  return meridiem ? `${time} ${meridiem}` : time;
+}
+
+/** Is this ISO instant before `now`? A missing or unparseable value is NOT past — "no expiry"
+ *  must never classify an offer as expired. */
+export function isPastDate(iso: string | undefined | null, now: number = Date.now()): boolean {
+  if (!iso) return false;
+  const t = Date.parse(iso);
+  return !Number.isNaN(t) && t < now;
+}

package/templates/branded-lite/tier5-src/_shared/himi-restaurants.ts

@@ -11,7 +11,7 @@ import { wixMediaUrl, type WixImageSize } from "@himalaya/wix-media";
 // copier recognizes + carries the dependency; resolves to the same file here
 // and in the scaffolded tier5-src/_shared/ layout.
 import { cleanTitle, initials } from "../_shared/himi-text.js";
-import { formatCurrency } from "../_shared/engine-intl.js";
+import { formatCurrency, normalizeFormattedPrice } from "../_shared/engine-intl.js";
 
 /** One dish tile/row: the media-XOR-initials card contract every himi list
  *  uses, plus a formatted price line and the templated detail screen id. */
@@ -97,13 +97,13 @@ export function itemPriceLine(item: WixItem): string {
     | { price?: unknown; currency?: unknown; formattedPrice?: unknown }
     | undefined;
   const formatted = typeof info?.formattedPrice === "string" ? info.formattedPrice.trim() : "";
-  if (formatted) return formatted;
+  if (formatted) return normalizeFormattedPrice(formatted);
   const price = info?.price;
   if (price == null || price === "" || Number.isNaN(Number(price))) return "";
   const currency = typeof info?.currency === "string" ? info.currency : "";
   if (!currency) return `${price}`;
   try {
-    return formatCurrency(Number(price), currency, "en", Number(price) % 1 === 0 ? 0 : 2);
+    return formatCurrency(Number(price), currency, "en");
   } catch {
     return `${price}`;
   }
@@ -149,7 +149,7 @@ export function itemPriceVariants(item: WixItem): Array<{ id: string; name: stri
     let priceLine = `${price}`;
     if (currency) {
       try {
-        priceLine = formatCurrency(Number(price), currency, "en", Number(price) % 1 === 0 ? 0 : 2);
+        priceLine = formatCurrency(Number(price), currency, "en");
       } catch { /* keep the bare amount */ }
     }
     rows.push({ id: typeof node.id === "string" && node.id ? node.id : `variant-${index}`, name: name || "Option", priceLine });

package/templates/branded-lite/tier5-src/_shared/owner-load-error.ts

@@ -74,6 +74,54 @@ const SITE_CONTEXT_CODES = ["MISSING_METASITE_ID", "MISSING_REQUEST_SITE_CONTEXT
  *  message and starts being a payload dump. */
 const MAX_RAW = 200;
 
+/**
+ * A TRANSPORT failure: the request never got an HTTP answer at all.
+ *
+ * Each host describes one in its own platform's words, and every one of them is a
+ * diagnostic dump rather than a message. iOS's JSWorker hands a worker the Swift
+ * description of the `NSError` —
+ *   `Error Domain=NSURLErrorDomain Code=-1004 "Could not connect to the server."
+ *    UserInfo={… NSErrorFailingURLStringKey=http://127.0.0.1:8178/__dev/wix/proxy, …}`
+ * — which Aria painted verbatim: the domain, the code, and the local server's
+ * own URL. Android's bridge carries the `java.net` exception text, and a browser's
+ * fetch rejects with "Failed to fetch" / "Load failed" / "NetworkError …".
+ *
+ * Only a message with NO HTTP status qualifies: a status means Wix answered, and
+ * that case keeps its own reductions below.
+ */
+const TRANSPORT = [
+  /\bError Domain=\w+/,                       // any Cocoa NSError description
+  /\bNSURLErrorDomain\b/,
+  /\bjava\.(?:net|io)\.\w+(?:Exception|Error)\b/,
+  /\b(?:UnknownHost|Connect|SocketTimeout|NoRouteToHost|SSLHandshake)Exception\b/,
+  // Android's WebViewJSWorker bridges `e.message ?: e.javaClass.simpleName`, so
+  // the class name is usually absent and only OkHttp's own message arrives.
+  /^Failed to connect to \S/,
+  /^Unable to resolve host\b/,
+  /\b(?:Connection refused|Network is unreachable|Software caused connection abort)\b/,
+  /^(?:timeout|Read timed out|connect timed out)$/i,
+  /\bFailed to fetch\b/,
+  /\bNetworkError when attempting to fetch\b/,
+  /^(?:TypeError: )?Load failed$/,
+  /\bnet::ERR_[A-Z_]+/,
+];
+
+/** Did this failure happen below HTTP — no answer from Wix at all? */
+export function isTransportFailure(e: unknown): boolean {
+  const msg = String((e as Error)?.message ?? e ?? "");
+  if (STATUS.test(msg)) return false;
+  return TRANSPORT.some((re) => re.test(msg));
+}
+
+/** The one sentence for a transport failure. Copy-as-configuration: the key is
+ *  under `ownerCommon.`, which every owner screen (Aria included) forwards. */
+export function ownerTransportFailureText(): string {
+  return copyParam(
+    "ownerCommon.networkUnreachable",
+    "Couldn’t reach Wix. Check your connection and try again.",
+  );
+}
+
 /**
  * Reduce a wire failure to something a PERSON can read.
  *
@@ -85,6 +133,7 @@ const MAX_RAW = 200;
  * markup; a long non-HTML body is truncated for the same reason.
  */
 function humanWireError(msg: string): string {
+  if (isTransportFailure(msg)) return ownerTransportFailureText();
   const status = STATUS.exec(msg)?.[1];
   // A JSON ENVELOPE or a NAMED REASON CODE is the machine's word for it, and the
   // owner gets neither. Both reductions used to live in `ownerDisplayError` only,

package/templates/branded-lite/tier5-src/_shared/wix-service-price.ts

@@ -119,7 +119,7 @@ export function formatServicePrice(service: unknown): string {
   if (amount == null) return "";
   const currency = serviceCurrency(service);
   try {
-    return formatCurrency(amount, currency, "en", 0);
+    return formatCurrency(amount, currency, "en");
   } catch {
     return `${amount}`;
   }

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

@@ -38,14 +38,14 @@ interface State {
 
 function row(collection: CmsCollectionDefinition): CollectionRow {
   const title = collection.displayName.trim() || collection.id;
-  const count = collection.fields.length;
+  // No field count and no "Available to visitors": both are back-office schema/permission
+  // metadata, meaningless to the visitor reading the card ([branded-lite-qa] #3077). "Members
+  // only" stays — it tells the visitor they will need to sign in, which is theirs to know.
   return {
     id: collection.id,
     title,
-    subtitle: `${count} ${count === 1 ? "field" : "fields"}`,
-    meta: collection.readRole === "ANYONE"
-      ? copyParam("cms.visitorAccessLabel", "Available to visitors")
-      : copyParam("cms.membersOnlyAccessLabel", "Members only"),
+    subtitle: "",
+    meta: collection.readRole === "ANYONE" ? "" : copyParam("cms.membersOnlyAccessLabel", "Members only"),
     initial: (title[0] || "C").toUpperCase(),
     detailScreenId: `himi_cms_collection_${encodeURIComponent(collection.id)}`,
   };

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

@@ -6,6 +6,8 @@
 import { defineService } from "../_shared/collection-service.js";
 import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
 import { queryCoupons, type WixCoupon } from "@himalaya/wix-coupons";
+import { copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { isPastDate, formatMonthDay } from "../_shared/engine-intl.js";
 
 interface Row { id: string; name: string; subtitle: string }
 interface S extends LoadFlags {
@@ -17,16 +19,40 @@ interface S extends LoadFlags {
   notMockEmpty: boolean; notMockUnavailable: boolean;
 }
 
-function norm(c: WixCoupon): Row {
-  const cc = c as unknown as { id?: string; name?: string; code?: string };
-  return { id: cc.id || cc.code || "coupon", name: cc.name || cc.code || "Coupon", subtitle: cc.code ? `Code: ${cc.code}` : "" };
+/** Rows from the live Coupons API. The query returns expired coupons alongside live ones, and the
+ *  row used to show them identically — an offer that "ended Aug 31" still listed as available in
+ *  September. An expired row now says so and sinks below the live ones;
+ *  a live one with an end date says when it ends. Both the flat and the `specification` shape are
+ *  read, because the stores v2 payload nests the name/code/expiry under `specification`. */
+function norm(c: WixCoupon, now: number): Row & { expired: boolean } {
+  const cc = c as unknown as {
+    id?: string; name?: string; code?: string; expirationTime?: string; expired?: boolean;
+    specification?: { name?: string; code?: string; expirationTime?: string };
+  };
+  const code = cc.code || cc.specification?.code || "";
+  const name = cc.name || cc.specification?.name || code || "Coupon";
+  const ends = cc.expirationTime || cc.specification?.expirationTime || "";
+  const expired = cc.expired === true || isPastDate(ends, now);
+  const endLabel = ends && !Number.isNaN(Date.parse(ends))
+    ? copyTemplate("coupons.endsLabel", "ends {date}", { date: formatMonthDay(new Date(ends)) }) : "";
+  const status = expired ? copyParam("coupons.expiredLabel", "Expired") : endLabel;
+  const subtitle = [code ? copyTemplate("coupons.codeLabel", "Code: {code}", { code }) : "", status].filter(Boolean).join(" · ");
+  return { id: cc.id || code || "coupon", name, subtitle, expired };
 }
 
+/** Live offers first, expired ones after — stable within each group. */
+export function couponRows(coupons: WixCoupon[], now: number = Date.now()): Row[] {
+  const rows = coupons.map((c) => norm(c, now));
+  return [...rows.filter((r) => !r.expired), ...rows.filter((r) => r.expired)].map(({ expired: _e, ...row }) => row);
+}
+
+// Sample rows carry no dates and no currency: a hardcoded "ends Aug 31" went stale the day after,
+// and "$10 off" read as the wrong currency on a ₪ site.
 const MOCK: Row[] = [
-  { id: "sample-welcome15", name: "Welcome — 15% off your first order", subtitle: "Code: WELCOME15 · ends Aug 31" },
-  { id: "sample-freeship", name: "Free shipping", subtitle: "Code: FREESHIP · orders over $50" },
+  { id: "sample-welcome15", name: "Welcome — 15% off your first order", subtitle: "Code: WELCOME15" },
+  { id: "sample-freeship", name: "Free shipping", subtitle: "Code: FREESHIP · on eligible orders" },
   { id: "sample-flash20", name: "Weekend flash — 20% off", subtitle: "Code: FLASH20 · this weekend only" },
-  { id: "sample-loyal10", name: "Loyalty reward — $10 off", subtitle: "Code: LOYAL10 · members only" },
+  { id: "sample-loyal10", name: "Loyalty reward — 10% off", subtitle: "Code: LOYAL10 · members only" },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;
@@ -45,7 +71,7 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("himiBrandedCoupons
     load: async (s) => {
       try {
         const r = await queryCoupons({ paging: { limit: 30 } } as never);
-        const coupons = (((r as unknown as { coupons?: WixCoupon[] }).coupons) ?? []).map(norm);
+        const coupons = couponRows(((r as unknown as { coupons?: WixCoupon[] }).coupons) ?? []);
         return { ...s, ...loaded("coupons", coupons, COPY) };
       } catch (err) {
         return { ...s, ...loadFailed("coupons", err, COPY) };

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

@@ -34,9 +34,9 @@ function norm(c: WixDonationCampaign): Row {
 }
 
 const MOCK: Row[] = [
-  { id: "sample-reef",   title: "Save the Coral Reef",   subtitle: "Goal: $10,000 · Active" },
-  { id: "sample-school", title: "Build a Village School", subtitle: "Goal: $25,000 · Active" },
-  { id: "sample-relief", title: "Winter Relief Fund",     subtitle: "Goal: $5,000 · Goal reached" },
+  { id: "sample-reef",   title: "Save the Coral Reef",   subtitle: "Active" },
+  { id: "sample-school", title: "Build a Village School", subtitle: "Active" },
+  { id: "sample-relief", title: "Winter Relief Fund",     subtitle: "Goal reached" },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;

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

@@ -19,25 +19,24 @@ interface S extends LoadFlags {
   notMockEmpty: boolean; notMockUnavailable: boolean;
 }
 
-const STATUS_LABEL: Record<string, string> = { PUBLISHED: "Published", DRAFT: "Draft" };
-
 /** The Wix Forms namespace the Forms app owns. Booking/event registration forms live
  *  in their own namespaces and are not this screen's subject. */
 const FORMS_NAMESPACE = "wix.form_app.form";
 
 function norm(f: WixForm): Row {
   const title = (f.name || "Form").trim() || "Form";
-  const fieldCount = Array.isArray(f.formFields) ? f.formFields.length : 0;
-  const statusLabel = f.enabled === false ? "Disabled" : (STATUS_LABEL[(f.status || "").toUpperCase()] || "");
-  const parts = [fieldCount ? (fieldCount === 1 ? "1 field" : `${fieldCount} fields`) : "", statusLabel].filter(Boolean);
-  return { id: f.id || "form", title, subtitle: parts.join(" · ") };
+  // The subtitle used to be "5 fields · Published" — a form-builder metric and a publishing
+  // status, both back-office facts ([branded-lite-qa] #3077). A visitor sees the form's own
+  // description when it has one, and nothing otherwise.
+  const raw = (f as { description?: unknown }).description;
+  return { id: f.id || "form", title, subtitle: typeof raw === "string" ? raw.trim() : "" };
 }
 
 /** Preview-only sample forms (see COPY below). */
 const MOCK: Row[] = [
-  { id: "sample-contact",   title: "Contact Us",       subtitle: "4 fields · Published" },
-  { id: "sample-subscribe", title: "Newsletter Signup", subtitle: "2 fields · Published" },
-  { id: "sample-feedback",  title: "Feedback",          subtitle: "5 fields · Published" },
+  { id: "sample-contact",   title: "Contact Us",       subtitle: "Send us a message." },
+  { id: "sample-subscribe", title: "Newsletter Signup", subtitle: "Get news and offers by email." },
+  { id: "sample-feedback",  title: "Feedback",          subtitle: "Tell us how we did." },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;
@@ -56,7 +55,9 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("himiBrandedForms",
     load: async (s) => {
       try {
         const r = await queryForms({ filter: { namespace: FORMS_NAMESPACE }, paging: { limit: 50 } });
-        const forms = (r.forms ?? []).map(norm);
+        // A visitor can only fill a live form: a disabled or draft one used to be listed with a
+        // "Disabled"/"Draft" label; now that the row carries no back-office status, it is not listed.
+        const forms = (r.forms ?? []).filter((f) => f.enabled !== false && !/^DRAFT$/i.test(String(f.status ?? ""))).map(norm);
         return { ...s, ...loaded("forms", forms, COPY) };
       } catch (err) {
         return { ...s, ...loadFailed("forms", err, COPY) };

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

@@ -38,9 +38,9 @@ function norm(c: WixGiftCard): Row {
 }
 
 const MOCK: Row[] = [
-  { id: "sample-1", title: "Gift card ····4821", subtitle: "Balance $50.00" },
-  { id: "sample-2", title: "Gift card ····9075", subtitle: "Balance $18.50" },
-  { id: "sample-3", title: "Gift card ····3312", subtitle: "Balance $0.00" },
+  { id: "sample-1", title: "Gift card ····4821", subtitle: "Example gift card" },
+  { id: "sample-2", title: "Gift card ····9075", subtitle: "Example gift card" },
+  { id: "sample-3", title: "Gift card ····3312", subtitle: "Example gift card" },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;

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

@@ -112,7 +112,10 @@ const svc = defineService<State, {
         // Probe before revealing anything picker-shaped (spec R8) — on a customer build this
         // stays false and the whole subtree is hidden.
         const canPick = await pickerAvailable();
-        next = { ...next, pickerAvailable: canPick, pickerHidden: !canPick };
+        // The runtime line names the internal platform ("HimalayaCore 0.0.1") — a number for
+        // whoever debugs the build, not for a white-label app's customer ([branded-lite-qa]
+        // #3002/#3083). It shows only on a build that opted into the QA picker.
+        next = { ...next, pickerAvailable: canPick, pickerHidden: !canPick, runtimeLine: canPick ? next.runtimeLine : "" };
         if (canPick) {
           // `active()` is more precise than app-info's releasePinned: it also says WHICH pin
           // (user vs baked) is holding the release.
@@ -122,7 +125,7 @@ const svc = defineService<State, {
           }
         }
       } catch {
-        next = { ...next, pickerAvailable: false, pickerHidden: true };
+        next = { ...next, pickerAvailable: false, pickerHidden: true, runtimeLine: "" };
       }
       return next;
     },

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

@@ -39,9 +39,9 @@ function norm(v: WixInvoice): Row {
 }
 
 const MOCK: Row[] = [
-  { id: "sample-1024", title: "Invoice #1024", subtitle: "Paid · $120.00" },
-  { id: "sample-1031", title: "Invoice #1031", subtitle: "Sent · $80.00" },
-  { id: "sample-1042", title: "Invoice #1042", subtitle: "Overdue · $45.00" },
+  { id: "sample-1024", title: "Invoice #1024", subtitle: "Paid" },
+  { id: "sample-1031", title: "Invoice #1031", subtitle: "Sent" },
+  { id: "sample-1042", title: "Invoice #1042", subtitle: "Overdue" },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;

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

@@ -31,7 +31,7 @@ function norm(r: WixLoyaltyReward, unit: string): Row {
 }
 
 const MOCK: Row[] = [
-  { id: "sample-5off",    name: "$5 off your next order", subtitle: "500 points" },
+  { id: "sample-5off",    name: "5% off your next order", subtitle: "500 points" },
   { id: "sample-ship",    name: "Free shipping",         subtitle: "300 points" },
   { id: "sample-15",      name: "15% off any purchase",  subtitle: "750 points" },
   { id: "sample-gift",    name: "Free welcome gift",     subtitle: "1,000 points" },

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

@@ -78,7 +78,7 @@ function money(plan: WixPlan): string {
   const raw = price?.value;
   if (raw == null || raw === "" || Number.isNaN(Number(raw))) return "";
   try {
-    return formatCurrency(Number(raw), price?.currency || "USD", "en", Number(raw) % 1 === 0 ? 0 : 2);
+    return formatCurrency(Number(raw), price?.currency || "USD", "en");
   } catch {
     return `${raw}`;
   }

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

@@ -124,7 +124,7 @@ function priceOf(p: WixProgram): string {
   if (raw == null || raw === "" || Number.isNaN(Number(raw))) return "";
   if (Number(raw) === 0) return "";
   try {
-    return formatCurrency(Number(raw), price?.currency || "USD", "en", Number(raw) % 1 === 0 ? 0 : 2);
+    return formatCurrency(Number(raw), price?.currency || "USD", "en");
   } catch {
     return `${raw}`;
   }

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

@@ -26,7 +26,8 @@ import {
   reserveReservation,
   type WixReservationLocation,
 } from "@himalaya/wix-table-reservations";
-import { addDays, dayKey, dayLabel, hhmm } from "@himalaya/time";
+import { addDays, dayKey, dayLabel } from "@himalaya/time";
+import { formatClock } from "../_shared/engine-intl.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
@@ -128,7 +129,8 @@ function slotsFor(day: string, now: Date): Option[] {
   for (let minutes = SERVICE_START_HOUR * 60; minutes <= SERVICE_END_HOUR * 60; minutes += SLOT_STEP_MINUTES) {
     const at = new Date(base.getFullYear(), base.getMonth(), base.getDate(), Math.floor(minutes / 60), minutes % 60, 0, 0);
     if (at.getTime() <= now.getTime()) continue;
-    out.push({ id: at.toISOString(), label: hhmm(at) });
+    // 12-hour like every other customer time (#3079 — the chips read "20:00").
+    out.push({ id: at.toISOString(), label: formatClock(at) });
   }
   return out;
 }
@@ -153,7 +155,7 @@ function chosen(arg: unknown): string {
  *  the strip does not silently discard the diner's 19:30. */
 function withDay(state: State, day: string, now = new Date()): State {
   const slots = slotsFor(day, now);
-  const keepTime = state.selectedSlot ? hhmm(state.selectedSlot) : "";
+  const keepTime = state.selectedSlot ? formatClock(new Date(state.selectedSlot)) : "";
   const match = keepTime ? slots.find((s) => s.label === keepTime) : undefined;
   const slot = match ?? slots[0];
   const when = slot ? new Date(slot.id) : undefined;

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

@@ -162,7 +162,7 @@ function tierPrice(t: WixAvailableTicket): string {
   // as "25" — a price that reads as a quantity, and nothing downstream could tell it was a
   // formatting failure. `formatCurrency` uses real Intl where it exists and a symbol-carrying
   // fallback where it does not, diffed against ECMA-402 in engine-intl-fallback.test.ts.
-  return formatCurrency(Number(raw), t.price?.currency || "USD", "en", Number(raw) % 1 === 0 ? 0 : 2);
+  return formatCurrency(Number(raw), t.price?.currency || "USD", "en");
 }
 
 function tierAvailable(t: WixAvailableTicket): boolean {

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

@@ -35,16 +35,32 @@ const svc = defineBackendCollection<S, EventRow>("himiEvents", {
     id: row => row.id,
     errorMessage: () => copyParam("events.errorText", "Events could not be loaded."),
     async cached(criteria) {
-      if (criteria.query || criteria.filter !== "all" || criteria.sort !== "default") return undefined;
-      return { items: await readCached(), nextCursor: "", metadata: { fromCache: true } };
+      // The list now OPENS on Upcoming, so the default view must keep its offline-first paint:
+      // serve the cache for it too, minus the rows that have finished.
+      const upcoming = criteria.filter === "value:Upcoming";
+      if (criteria.query || (criteria.filter !== "all" && !upcoming) || criteria.sort !== "default") return undefined;
+      const rows = await readCached();
+      return { items: upcoming ? rows.filter((row) => row.statusLabel !== "Past") : rows, nextCursor: "", metadata: { fromCache: true } };
     },
     async fetch(criteria, cursor) {
       if (!cursor) queryNow = new Date().toISOString();
       if (criteria.filter === "saved" && !criteria.savedIds.length) return { items: [], nextCursor: "" };
       const filter: Record<string, unknown> = { status: { $ne: "DRAFT" } };
-      if (criteria.query) filter.title = { $eq: criteria.query };
+      // Prefix, not exact: the placeholder says "Search events", and an exact-title match returned
+      // nothing for "Harvest" when the event is "Harvest Tasting".
+      if (criteria.query) filter.title = { $startsWith: criteria.query };
       if (criteria.filter === "saved") filter.id = { $in: criteria.savedIds };
-      if (criteria.filter === "value:Upcoming") filter["dateAndTimeSettings.startDate"] = { $gte: queryNow };
+      // Upcoming = not started yet OR not finished yet: an event in progress (a festival on its
+      // second day) is still on. The start-date arm is what keeps a START-ONLY event (no endDate
+      // — valid in Wix Events) in the list; a filter on endDate alone dropped it from both views.
+      // Past stays "has started", so an in-progress event may appear under both; its row is only
+      // marked "Past" once it has actually finished (`eventIsPast`).
+      if (criteria.filter === "value:Upcoming") {
+        filter.$or = [
+          { "dateAndTimeSettings.startDate": { $gte: queryNow } },
+          { "dateAndTimeSettings.endDate": { $gte: queryNow } },
+        ];
+      }
       if (criteria.filter === "value:Past") filter["dateAndTimeSettings.startDate"] = { $lt: queryNow };
       const res = await queryEvents({ limit: 50, offset: Number(cursor || 0), query: { filter,
         sort: [{ fieldName: criteria.sort === "default" ? "dateAndTimeSettings.startDate" : "title", order: criteria.sort === "za" ? "DESC" : "ASC" }, { fieldName: "id", order: "ASC" }] } });

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

@@ -63,9 +63,9 @@ async function identityLine(): Promise<string> {
     const identity = await dispatch("himi.wix.memberIdentity") as { email?: string } | null;
     return identity?.email
       ? copyTemplate("myEvents.signedInAs", "Signed in as {email}", { email: identity.email })
-      : copyParam("myEvents.identityGuest", "RSVPs saved on this device — not yet your full Wix Events history.");
+      : copyParam("myEvents.identityGuest", "RSVPs you confirm on this device appear here.");
   } catch {
-    return copyParam("myEvents.identityGuest", "RSVPs saved on this device — not yet your full Wix Events history.");
+    return copyParam("myEvents.identityGuest", "RSVPs you confirm on this device appear here.");
   }
 }
 

package/templates/branded-lite/tier5-src/wix-spaces-collections/index.ts

@@ -26,7 +26,7 @@ function fromCategory(c: StoreCategory): Row {
 function fromCollection(c: WixCollection): Row {
   const cc = c as unknown as { id?: string; name?: string; numberOfProducts?: number };
   const n = cc.numberOfProducts;
-  return { id: cc.id || cc.name || "collection", name: cc.name || "Collection", subtitle: n != null ? `${n} ${n === 1 ? "product" : "products"}` : "" };
+  return { id: cc.id || cc.name || "collection", name: cc.name || "Collection", subtitle: n != null && n > 0 ? `${n} ${n === 1 ? "product" : "products"}` : "" };
 }
 
 type Loaded = { ok: true; rows: Row[] } | { ok: false; error: string };