@wix/himalaya-cli 0.1035.0 → 0.1037.0

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

@@ -3881,17 +3881,6 @@ const SCREENS = runtimeSetting({
                         }
                       }
                     },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "__HIMI_APP_NAME__",
-                          "style": "bodyEmphasis"
-                        }
-                      }
-                    },
                     {
                       "id": "",
                       "body": {
@@ -5525,16 +5514,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"
               }
             }
           ]
@@ -5626,7 +5663,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Service name starts with…",
+                  "placeholder": "Search services",
                   "debounceMs": 200,
                   "onChange": {
                     "actionId": "tier5.himiBookingServices.collectionSearch"
@@ -6818,20 +6855,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himibookingservices_refresh",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBookingServices.refresh"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_services.list.collection.more",
                                               "body": {
@@ -7507,20 +7530,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himibookingservices_refresh",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBookingServices.refresh"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_services.list.collection.compact-more",
                                               "body": {
@@ -8805,7 +8814,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "SearchField",
                                 "props": {
-                                  "placeholder": "Exact booking ID",
+                                  "placeholder": "Search by booking ID",
                                   "value": "$service:himiBookingBookings.collection.query",
                                   "debounceMs": 200,
                                   "onChange": {
@@ -9720,20 +9729,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himibookingbookings_refresh",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBookingBookings.refresh"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_bookings.list.collection.more",
                                               "body": {
@@ -10346,20 +10341,6 @@ const SCREENS = runtimeSetting({
                                                 }
                                               }
                                             },
-                                            {
-                                              "id": "btn_tier5_himibookingbookings_refresh",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Button",
-                                                "props": {
-                                                  "title": "Refresh",
-                                                  "style": "plain",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBookingBookings.refresh"
-                                                  }
-                                                }
-                                              }
-                                            },
                                             {
                                               "id": "himi_bookings.list.collection.compact-more",
                                               "body": {
@@ -11649,7 +11630,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "SearchField",
                         "props": {
-                          "placeholder": "Search loaded items",
+                          "placeholder": "Search",
                           "value": "$service:himiBrandedPrograms.collection.query",
                           "debounceMs": 200,
                           "onChange": {
@@ -13333,7 +13314,7 @@ const SCREENS = runtimeSetting({
                                       "package": "himalaya",
                                       "type": "Text",
                                       "props": {
-                                        "text": "Sort loaded items",
+                                        "text": "Sort",
                                         "style": "bodyEmphasis"
                                       }
                                     }
@@ -14183,7 +14164,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "SearchField",
                         "props": {
-                          "placeholder": "Search loaded items",
+                          "placeholder": "Search",
                           "value": "$service:himiBrandedPlans.collection.query",
                           "debounceMs": 200,
                           "onChange": {
@@ -14573,7 +14554,7 @@ const SCREENS = runtimeSetting({
                                                                   "text": "$item.collectionMeta",
                                                                   "style": "caption",
                                                                   "color": "textSecondary",
-                                                                  "maxLines": 2,
+                                                                  "maxLines": 8,
                                                                   "collapseWhenEmpty": true
                                                                 }
                                                               }
@@ -14821,9 +14802,9 @@ const SCREENS = runtimeSetting({
                                         "package": "himalaya",
                                         "type": "Grid",
                                         "props": {
-                                          "columns": 2,
-                                          "columnsMedium": 3,
-                                          "columnsExpanded": 4,
+                                          "columns": 1,
+                                          "columnsMedium": 2,
+                                          "columnsExpanded": 3,
                                           "spacing": 12,
                                           "itemsPath": "$service:himiBrandedPlans.collection.items",
                                           "items": [
@@ -14880,7 +14861,7 @@ const SCREENS = runtimeSetting({
                                                                   "text": "$item.collectionMeta",
                                                                   "style": "caption",
                                                                   "color": "textSecondary",
-                                                                  "maxLines": 2,
+                                                                  "maxLines": 8,
                                                                   "collapseWhenEmpty": true
                                                                 }
                                                               }
@@ -15449,9 +15430,9 @@ const SCREENS = runtimeSetting({
                                         "package": "himalaya",
                                         "type": "Grid",
                                         "props": {
-                                          "columns": 2,
-                                          "columnsMedium": 3,
-                                          "columnsExpanded": 4,
+                                          "columns": 1,
+                                          "columnsMedium": 2,
+                                          "columnsExpanded": 3,
                                           "spacing": 8,
                                           "itemsPath": "$service:himiBrandedPlans.collection.items",
                                           "items": [
@@ -15825,7 +15806,7 @@ const SCREENS = runtimeSetting({
                                       "package": "himalaya",
                                       "type": "Text",
                                       "props": {
-                                        "text": "Sort loaded items",
+                                        "text": "Sort",
                                         "style": "bodyEmphasis"
                                       }
                                     }
@@ -16107,7 +16088,7 @@ const SCREENS = runtimeSetting({
                                                         "text": "$item.collectionMeta",
                                                         "style": "caption",
                                                         "color": "textSecondary",
-                                                        "maxLines": 2,
+                                                        "maxLines": 8,
                                                         "collapseWhenEmpty": true
                                                       }
                                                     }
@@ -17438,7 +17419,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Exact event title",
+                  "placeholder": "Search events",
                   "debounceMs": 200,
                   "onChange": {
                     "actionId": "tier5.himiEvents.collectionSearch"
@@ -18631,20 +18612,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": {
@@ -19320,20 +19287,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": {
@@ -20806,7 +20759,7 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "SearchField",
                 "props": {
-                  "placeholder": "Search loaded items",
+                  "placeholder": "Search",
                   "debounceMs": 200,
                   "onChange": {
                     "actionId": "tier5.himiBlogFeed.collectionSearch"
@@ -21918,20 +21871,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": {
@@ -22569,20 +22508,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": {
@@ -22709,7 +22634,7 @@ const SCREENS = runtimeSetting({
                                               "package": "himalaya",
                                               "type": "Text",
                                               "props": {
-                                                "text": "Sort loaded items",
+                                                "text": "Sort",
                                                 "style": "bodyEmphasis"
                                               }
                                             }
@@ -23413,7 +23338,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"
                         }

package/templates/yoga-studio/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/yoga-studio/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/yoga-studio/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/yoga-studio/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 });