@wix/himalaya-cli 0.1035.0 → 0.1037.0

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

@@ -2,7 +2,7 @@
 // The public project row is resolved again from Wix, then its ordered project
 // items supply the actual image/video/text story. No sample project is invented.
 import { defineService } from "@himalaya/state";
-import { listProjectItems, listProjects, type WixPortfolioProjectItem } from "@himalaya/wix-portfolio";
+import { listProjectItems, listProjects, portfolioCoverRef, type WixPortfolioProjectItem } from "@himalaya/wix-portfolio";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
 import { presence, type PresenceFlags } from "../_shared/detail-presence.js";
@@ -48,7 +48,7 @@ function inputId(): string {
 }
 
 function imageOf(item: WixPortfolioProjectItem): string {
-  return wixMediaUrl(item.image?.imageInfo?.url ?? item.image?.imageInfo?.id, WIX_DETAIL_IMAGE);
+  return wixMediaUrl(portfolioCoverRef(item.image), WIX_DETAIL_IMAGE);
 }
 
 function row(item: WixPortfolioProjectItem, index: number): MediaRow {
@@ -133,7 +133,7 @@ const svc = defineService<State, { load: (state: State, arg?: unknown) => Promis
           title: (project.title || copyParam("portfolioProject.projectFallbackName", "Project")).trim(),
           initial: ((project.title || "P").trim()[0] || "P").toUpperCase(),
           description: (project.description ?? "").trim(),
-          coverImage: wixMediaUrl(project.coverImage || "", WIX_DETAIL_IMAGE),
+          coverImage: wixMediaUrl(portfolioCoverRef(project.coverImage), WIX_DETAIL_IMAGE),
           items,
           emptyText: items.length ? "" : copyParam("portfolioProject.noMediaText", "This project has no published media yet."),
           ...presence("found"),

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 };

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

@@ -16,6 +16,8 @@ interface Row {
   counts: string;    // "(likeCount) likes · (commentCount) comments"
   photo: string;
   initial: string;
+  /** True when there is neither an author name nor a photo to show. */
+  noAvatar: boolean;
 }
 interface S { status: "loading" | "ready"; all: Row[]; posts: Row[]; emptyText: string }
 
@@ -73,7 +75,11 @@ function norm(p: WixPost): Row {
     excerpt,
     counts,
     photo,
-    initial: ((author || title || "#")[0] || "#").toUpperCase(),
+    // The monogram is the AUTHOR's: it used to fall back to the post title, so an anonymous
+    // post wore a "W" for "Welcome to the Forum" ([branded-lite-qa] #3077). No author → no
+    // avatar (`noAvatar`), rather than a letter that belongs to nobody.
+    initial: (author[0] || "").toUpperCase(),
+    noAvatar: !author && !photo,
   };
 }
 

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

@@ -4,7 +4,7 @@ import { withEmptyFlags } from "../_shared/empty-flags.js";
 import { listAnnouncements, type WixAnnouncement } from "@himalaya/wix-new-releases";
 
 interface Row { id: string; name: string; subtitle: string }
-interface S { status: "loading" | "ready"; items: Row[]; emptyText: string }
+interface S { status: "loading" | "ready"; items: Row[]; emptyText: string; /** hiddenWhen hides on true: the empty card shows only once loaded AND empty. */ noEmpty: boolean }
 
 function norm(a: WixAnnouncement, i: number): Row {
   const aa = a as unknown as { id?: string; title?: string; bodyText?: string; description?: string };
@@ -12,14 +12,14 @@ function norm(a: WixAnnouncement, i: number): Row {
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesWhatsNew", withEmptyFlags({
-  state: { status: "loading", items: [], emptyText: "" },
+  state: { status: "loading", items: [], emptyText: "", noEmpty: true },
   actions: {
     load: async (s) => {
       try {
         const r = await listAnnouncements(20);
         const items = (((r as unknown as { announcements?: WixAnnouncement[] }).announcements) ?? []).map(norm);
-        return { status: "ready", items, emptyText: items.length ? "" : "Nothing new right now" };
-      } catch { return { ...s, status: "ready", items: [], emptyText: "Nothing new right now" }; }
+        return { status: "ready", items, emptyText: items.length ? "" : "Nothing new right now", noEmpty: items.length > 0 };
+      } catch { return { ...s, status: "ready", items: [], emptyText: "Nothing new right now", noEmpty: false }; }
     },
   },
 }, { items: "noItems" }));

package/templates/community-club/dev/index.ts

@@ -3224,17 +3224,6 @@ const SCREENS = runtimeSetting({
                         }
                       }
                     },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "__HIMI_APP_NAME__",
-                          "style": "bodyEmphasis"
-                        }
-                      }
-                    },
                     {
                       "id": "",
                       "body": {
@@ -4868,16 +4857,64 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "",
+              "id": "himi_whats_new.empty",
               "body": {
                 "package": "himalaya",
-                "type": "Text",
+                "type": "VStack",
                 "props": {
-                  "text": "$service:spacesWhatsNew.emptyText",
-                  "style": "body",
-                  "color": "textSecondary",
-                  "collapseWhenEmpty": true
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "newspaper",
+                          "size": 28,
+                          "tint": "textTertiary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesWhatsNew.emptyText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    }
+                  ]
                 }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:spacesWhatsNew.noEmpty"
               }
             }
           ]
@@ -5899,7 +5936,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Exact event title",
+                  "placeholder": "Search events",
                   "debounceMs": 200,
                   "onChange": {
                     "actionId": "tier5.himiEvents.collectionSearch"
@@ -7092,20 +7129,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himievents_refresh",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiEvents.refresh"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_events.list.collection.more",
                                               "body": {
@@ -7781,20 +7804,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himievents_refresh",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiEvents.refresh"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_events.list.collection.compact-more",
                                               "body": {
@@ -9267,7 +9276,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Search loaded items",
+                  "placeholder": "Search",
                   "debounceMs": 200,
                   "onChange": {
                     "actionId": "tier5.himiBlogFeed.collectionSearch"
@@ -10379,20 +10388,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himiblogfeed_retry",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBlogFeed.retry"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_blog.list.collection.more",
                                               "body": {
@@ -11030,20 +11025,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himiblogfeed_retry",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBlogFeed.retry"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_blog.list.collection.compact-more",
                                               "body": {
@@ -11170,7 +11151,7 @@ const SCREENS = runtimeSetting({
                                               "package": "himalaya",
                                               "type": "Text",
                                               "props": {
-                                                "text": "Sort loaded items",
+                                                "text": "Sort",
                                                 "style": "bodyEmphasis"
                                               }
                                             }
@@ -11874,7 +11855,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Posts saved on this member device.",
+                          "text": "Posts you have saved to read later.",
                           "style": "body",
                           "color": "textSecondary"
                         }
@@ -12432,7 +12413,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Search loaded items",
+                  "placeholder": "Search",
                   "autoCapitalization": "none",
                   "submitLabel": "search",
                   "onChange": {
@@ -14177,7 +14158,7 @@ const SCREENS = runtimeSetting({
                                       "package": "himalaya",
                                       "type": "Text",
                                       "props": {
-                                        "text": "Sort loaded items",
+                                        "text": "Sort",
                                         "style": "bodyEmphasis"
                                       }
                                     }
@@ -14950,7 +14931,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Search loaded items",
+                  "placeholder": "Search",
                   "autoCapitalization": "none",
                   "submitLabel": "search",
                   "onChange": {
@@ -16528,7 +16509,7 @@ const SCREENS = runtimeSetting({
                                       "package": "himalaya",
                                       "type": "Text",
                                       "props": {
-                                        "text": "Sort loaded items",
+                                        "text": "Sort",
                                         "style": "bodyEmphasis"
                                       }
                                     }

package/templates/community-club/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/community-club/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/community-club/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;
+}