@wix/himalaya-cli 0.1632.0 → 0.1634.0

package/templates/salon-spa/dev/index.ts

@@ -12714,7 +12714,7 @@ const SCREENS = runtimeSetting({
                                                         "type": "Text",
                                                         "props": {
                                                           "text": "$item.bodyMarkdown",
-                                                          "style": "body",
+                                                          "style": "caption",
                                                           "color": "textPrimary",
                                                           "collapseWhenEmpty": true,
                                                           "textDirection": "auto",
@@ -12918,7 +12918,8 @@ const SCREENS = runtimeSetting({
                                                               }
                                                             }
                                                           ],
-                                                          "spacing": 6
+                                                          "spacing": 6,
+                                                          "horizontal": false
                                                         }
                                                       },
                                                       "modifiers": {
@@ -12941,7 +12942,7 @@ const SCREENS = runtimeSetting({
                                                       "modifiers": {}
                                                     }
                                                   ],
-                                                  "spacing": 7,
+                                                  "spacing": 5,
                                                   "alignment": "leading"
                                                 }
                                               },
@@ -12958,12 +12959,12 @@ const SCREENS = runtimeSetting({
                                                 },
                                                 "cornerRadius": 16,
                                                 "padding": {
-                                                  "leading": 10,
-                                                  "trailing": 10,
-                                                  "top": 10,
-                                                  "bottom": 10
+                                                  "leading": 8,
+                                                  "trailing": 8,
+                                                  "top": 8,
+                                                  "bottom": 8
                                                 },
-                                                "maxWidth": 360,
+                                                "maxWidth": 300,
                                                 "hiddenPath": "$item.isCard"
                                               }
                                             },
@@ -13372,7 +13373,8 @@ const SCREENS = runtimeSetting({
                                                                       }
                                                                     }
                                                                   ],
-                                                                  "spacing": 6
+                                                                  "spacing": 6,
+                                                                  "horizontal": false
                                                                 }
                                                               },
                                                               "modifiers": {
@@ -13524,7 +13526,7 @@ const SCREENS = runtimeSetting({
                                                 "type": "Text",
                                                 "props": {
                                                   "text": "$item.bodyText",
-                                                  "style": "body",
+                                                  "style": "caption",
                                                   "color": "textOnAccent",
                                                   "collapseWhenEmpty": true,
                                                   "textDirection": "auto",
@@ -13549,7 +13551,7 @@ const SCREENS = runtimeSetting({
                                               "modifiers": {}
                                             }
                                           ],
-                                          "spacing": 7,
+                                          "spacing": 5,
                                           "alignment": "leading"
                                         }
                                       },
@@ -13560,12 +13562,12 @@ const SCREENS = runtimeSetting({
                                         },
                                         "cornerRadius": 16,
                                         "padding": {
-                                          "leading": 10,
-                                          "trailing": 10,
-                                          "top": 10,
-                                          "bottom": 10
+                                          "leading": 8,
+                                          "trailing": 8,
+                                          "top": 8,
+                                          "bottom": 8
                                         },
-                                        "maxWidth": 360
+                                        "maxWidth": 300
                                       }
                                     }
                                   ],
@@ -13787,10 +13789,11 @@ const SCREENS = runtimeSetting({
                                         "type": "Text",
                                         "props": {
                                           "text": "$item.label",
-                                          "style": "body",
+                                          "style": "caption",
                                           "color": "accentPrimary",
                                           "collapseWhenEmpty": true,
-                                          "textDirection": "auto"
+                                          "textDirection": "auto",
+                                          "maxLines": 1
                                         }
                                       },
                                       "modifiers": {}
@@ -13801,13 +13804,13 @@ const SCREENS = runtimeSetting({
                                 }
                               },
                               "modifiers": {
-                                "fillMaxWidth": true,
-                                "cornerRadius": 16,
+                                "fillMaxWidth": false,
+                                "cornerRadius": 12,
                                 "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 10,
-                                  "bottom": 10
+                                  "leading": 10,
+                                  "trailing": 10,
+                                  "top": 5,
+                                  "bottom": 5
                                 },
                                 "background": {
                                   "token": "accentSurface"
@@ -13837,10 +13840,11 @@ const SCREENS = runtimeSetting({
                                         "type": "Text",
                                         "props": {
                                           "text": "$item.label",
-                                          "style": "body",
+                                          "style": "caption",
                                           "color": "textSecondary",
                                           "collapseWhenEmpty": true,
-                                          "textDirection": "auto"
+                                          "textDirection": "auto",
+                                          "maxLines": 1
                                         }
                                       },
                                       "modifiers": {}
@@ -13851,16 +13855,16 @@ const SCREENS = runtimeSetting({
                                 }
                               },
                               "modifiers": {
-                                "fillMaxWidth": true,
-                                "cornerRadius": 16,
+                                "fillMaxWidth": false,
+                                "cornerRadius": 12,
                                 "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 10,
-                                  "bottom": 10
+                                  "leading": 10,
+                                  "trailing": 10,
+                                  "top": 5,
+                                  "bottom": 5
                                 },
                                 "background": {
-                                  "token": "surfaceElevated"
+                                  "token": "surfaceSecondary"
                                 },
                                 "hiddenPath": "$item.enabled"
                               }
@@ -13871,11 +13875,12 @@ const SCREENS = runtimeSetting({
                         }
                       },
                       "modifiers": {
-                        "fillMaxWidth": true
+                        "fillMaxWidth": false
                       }
                     }
                   ],
-                  "spacing": 6
+                  "spacing": 8,
+                  "horizontal": true
                 }
               },
               "modifiers": {
@@ -13891,41 +13896,72 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "children": [
                     {
-                      "id": "himi_business_chat.draft",
+                      "id": "himi_business_chat.draft_shell",
                       "body": {
                         "package": "himalaya",
-                        "type": "TextField",
+                        "type": "ZStack",
                         "props": {
-                          "valuePath": "$service:businessChat.draft",
-                          "onChange": {
-                            "actionId": "tier5.businessChat.setDraft"
-                          },
-                          "placeholder": "Type your message…",
-                          "maxLength": 4000,
-                          "multilineMaxLines": 5,
-                          "borderless": true
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "himi_business_chat.draft_outline",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "children": [],
+                                  "spacing": 0,
+                                  "alignment": "leading"
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "height": 40,
+                                "background": {
+                                  "token": "surfacePrimary"
+                                },
+                                "cornerRadius": 20,
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "border"
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_business_chat.draft",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "TextField",
+                                "props": {
+                                  "valuePath": "$service:businessChat.draft",
+                                  "onChange": {
+                                    "actionId": "tier5.businessChat.setDraft"
+                                  },
+                                  "placeholder": "Type your message…",
+                                  "maxLength": 4000,
+                                  "multilineMaxLines": 1,
+                                  "borderless": true
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "accessibilityLabel": "Type your message",
+                                "padding": {
+                                  "leading": 8,
+                                  "trailing": 8,
+                                  "top": 0,
+                                  "bottom": 0
+                                }
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
                         "weight": 1,
-                        "fillMaxWidth": true,
-                        "accessibilityLabel": "Type your message",
-                        "padding": {
-                          "leading": 12,
-                          "trailing": 10,
-                          "top": 2,
-                          "bottom": 2
-                        },
-                        "background": {
-                          "token": "surfacePrimary"
-                        },
-                        "cornerRadius": 22,
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        }
+                        "fillMaxWidth": true
                       }
                     },
                     {
@@ -13992,16 +14028,22 @@ const SCREENS = runtimeSetting({
                       }
                     }
                   ],
-                  "spacing": 8,
+                  "spacing": 6,
                   "alignment": "center"
                 }
               },
               "modifiers": {
-                "fillMaxWidth": true
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 8,
+                  "trailing": 8,
+                  "top": 0,
+                  "bottom": 0
+                }
               }
             }
           ],
-          "spacing": 8,
+          "spacing": 0,
           "alignment": "leading"
         }
       },
@@ -14012,10 +14054,10 @@ const SCREENS = runtimeSetting({
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 8,
-          "trailing": 8,
-          "top": 8,
-          "bottom": 8
+          "leading": 0,
+          "trailing": 0,
+          "top": 4,
+          "bottom": 0
         }
       }
     },

package/templates/salon-spa/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/salon-spa/tier5-src/_shared/business-chat-history.ts

@@ -27,7 +27,10 @@ export function smartChatHistory(aiMessages: unknown[], memberPage: unknown[], p
     const mine = sender === 'SITE_VISITOR' && VISITOR_TYPES.has(kind);
     if (!mine && !(sender === 'ASSISTANT' && ASSISTANT_TYPES.has(kind)) && !(sender === 'USER' && STAFF_TYPES.has(kind))) continue;
     const body = object(message.body);
-    const bodyText = [text(body.mainText), text(body.footerText)].filter(Boolean).join('\n');
+    const selectedAction = kind === 'VISITOR_OPTION_SELECTED' && Array.isArray(body.additionalData)
+      ? body.additionalData.map(object).find(part => part.type === 'select_option' && text(part.action).trim())?.action
+      : '';
+    const bodyText = [text(body.mainText) || text(selectedAction), text(body.footerText)].filter(Boolean).join('\n');
     const rich = memberRows.get(text(message.inboxId));
     // A quick-reply-only metadata answer is not an empty bubble (the options are shown by the composer).
     if (!bodyText && !rich) continue;

package/templates/salon-spa/tier5-src/_shared/business-chat-presenter.ts

@@ -1,3 +1,4 @@
+import { isBusinessRoom } from "./inbox-rooms.js";
 import { businessChatCopy } from "./business-chat-copy.js";
 import { formatMonthDay } from "./engine-intl.js";
 type RecordValue = Record<string, unknown>;
@@ -78,13 +79,7 @@ const object = (value: unknown): RecordValue =>
 /** Return a sole existing two-party business room, or a unique business-name match among several;
  * never create a room or guess among remaining matches. */
 export function selectExistingBusinessRoom(rooms: unknown[], businessName?: string, requireUnambiguous = false): { id: string; participantId: string } | undefined {
-  let candidates = rooms.filter((value) => {
-    const room = object(value);
-    return typeof room.id === "string" && !!room.id &&
-      typeof room.participantId === "string" && !!room.participantId &&
-      room.participantCount === 2 && room.clientReferenceType === "contactId" &&
-      Object.keys(object(room.businessContext)).length > 0;
-  });
+  let candidates = rooms.filter(isBusinessRoom);
   const candidateCount = candidates.length;
   if (candidateCount > 1 && businessName?.trim()) {
     // Keep case significant so differently named businesses are not conflated.

package/templates/salon-spa/tier5-src/_shared/inbox-rooms.ts

@@ -0,0 +1,68 @@
+// The member's Inbox rows: every chatroom the member-role chat list returns, business and member alike.
+// Pure, so the worker and its tests share one classification of what a room is.
+
+type RecordValue = Record<string, unknown>;
+const object = (value: unknown): RecordValue =>
+  value !== null && typeof value === "object" && !Array.isArray(value) ? value as RecordValue : {};
+
+/** The two-party room between the member and the business (the Smart Chat room). Another member's
+ *  room has no `businessContext`, and a contact-less room is not the business's. */
+export function isBusinessRoom(value: unknown): boolean {
+  const room = object(value);
+  return typeof room.id === "string" && !!room.id &&
+    typeof room.participantId === "string" && !!room.participantId &&
+    room.participantCount === 2 && room.clientReferenceType === "contactId" &&
+    Object.keys(object(room.businessContext)).length > 0;
+}
+
+export interface InboxRow {
+  id: string;
+  title: string;
+  subtitle: string;
+  /** The screen a tap opens: the business chat for the business room, a thread for any other. */
+  screenId: "himi_business_chat" | "himi_chat_thread";
+  /** `chatroom` makes the thread use `id` as the room instead of resolving it as a member id. */
+  kind: "chatroom" | "";
+  photo: string;
+  initial: string;
+  unread: boolean;
+  unreadDot: string;
+  /** Sort key only; not bound to the screen. */
+  at: number;
+}
+
+const text = (value: unknown): string => (typeof value === "string" ? value.trim() : "");
+
+function titleOf(room: RecordValue, business: boolean): string {
+  const display = text(object(room.displayData).name);
+  if (business) return text(object(room.businessContext).name) || display;
+  return display;
+}
+
+/** Newest conversation first; archived rooms and rooms without an id are dropped. `fallbackTitle` names a
+ *  room that carries no name (the caller passes the localised word, not a hard-coded English one). */
+export function inboxRows(rooms: unknown[], fallbackTitle: string): InboxRow[] {
+  const rows: InboxRow[] = [];
+  for (const value of rooms) {
+    const room = object(value);
+    const id = text(room.id);
+    if (!id || room.isArchived === true) continue;
+    const business = isBusinessRoom(room);
+    const title = titleOf(room, business) || fallbackTitle;
+    const last = object(room.lastMessage);
+    const unread = typeof room.unreadCount === "number" && room.unreadCount > 0;
+    rows.push({
+      id,
+      title,
+      subtitle: text(last.summary),
+      screenId: business ? "himi_business_chat" : "himi_chat_thread",
+      kind: business ? "" : "chatroom",
+      photo: text(object(object(room.displayData).image).url),
+      initial: (title[0] ?? "#").toUpperCase(),
+      unread,
+      unreadDot: unread ? "●" : "",
+      at: typeof last.createdAt === "number" ? last.createdAt : typeof room.createdAt === "number" ? room.createdAt : 0,
+    });
+  }
+  return rows.sort((a, b) => b.at - a.at);
+}