@wix/himalaya-cli 0.1479.0 → 0.1481.0

package/templates/nonprofit-cause/dev/index.ts

@@ -10554,14 +10554,15 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "Button",
                 "props": {
-                  "title": "Go to Account",
+                  "title": "Sign in",
                   "style": "secondary",
                   "fullWidth": true,
                   "leadingIcon": "person",
                   "action": {
                     "actionId": "himi.open",
                     "params": {
-                      "screenId": "himi_account"
+                      "screenId": "himi_sign_in",
+                      "mode": "signin"
                     }
                   }
                 }
@@ -22283,140 +22284,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       }
                     },
-                    {
-                      "id": "himi_rsvp.signin_card",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
-                        "props": {
-                          "spacing": 12,
-                          "alignment": "leading",
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 10,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Icon",
-                                        "props": {
-                                          "name": "person",
-                                          "size": 18,
-                                          "tint": "accentPrimary"
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityRole": "decorative"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "Sign in to RSVP",
-                                          "style": "bodyEmphasis"
-                                        }
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Events can be browsed as a guest. RSVP is saved to your member identity.",
-                                  "style": "body",
-                                  "color": "textSecondary"
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_rsvp.email",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "TextField",
-                                "props": {
-                                  "placeholder": "Email",
-                                  "value": "",
-                                  "keyboard": "email",
-                                  "autoCapitalization": "none",
-                                  "onChange": {
-                                    "actionId": "tier5.himiEventsRsvp.setEmail"
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_rsvp.password",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "TextField",
-                                "props": {
-                                  "placeholder": "Password",
-                                  "valuePath": "$service:himiEventsRsvp.password",
-                                  "secure": true,
-                                  "autoCapitalization": "none",
-                                  "onChange": {
-                                    "actionId": "tier5.himiEventsRsvp.setPassword"
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_rsvp.signin",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Sign in",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "tier5.himiEventsRsvp.signIn"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "pressFeedback": "scale",
-                                "haptic": "medium"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "background": {
-                          "token": "surfaceElevated"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 8,
-                        "padding": {
-                          "leading": 14,
-                          "trailing": 14,
-                          "top": 14,
-                          "bottom": 14
-                        },
-                        "hiddenPath": "$service:himiEventsRsvp.isMember"
-                      }
-                    },
                     {
                       "id": "himi_rsvp.member_card",
                       "body": {
@@ -22532,6 +22399,32 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "hiddenPath": "$service:himiEventsRsvp.noSuccess"
                       }
                     },
+                    {
+                      "id": "himi_rsvp.confirm_sign_in",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Confirm RSVP",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "intent": "rsvp"
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "hiddenPath": "$service:himiEventsRsvp.hideGuestRsvp"
+                      }
+                    },
                     {
                       "id": "himi_rsvp.confirm",
                       "body": {

package/templates/nonprofit-cause/tier5-src/himi-events-rsvp/index.ts

@@ -35,6 +35,9 @@ interface S {
   noSuccess: boolean;
   canRsvp: boolean;
   cannotRsvp: boolean;
+  /** Hides a guest's RSVP button, which opens a sign-in screen: shown only for a guest with
+   *  an event to RSVP to, as `cannotRsvp` requires an event for a member's. */
+  hideGuestRsvp: boolean;
   errored: boolean;
   notErrored: boolean;
   isLoading: boolean;
@@ -74,6 +77,7 @@ function derive(s: S): S {
     notMember: !s.isMember,
     canRsvp,
     cannotRsvp: !canRsvp,
+    hideGuestRsvp: s.isMember || !hasEvent,
     noSuccess: !hasSuccess,
     notErrored: !s.errored,
     noEmpty: s.status === "loading" || s.errored || hasEvent,
@@ -144,6 +148,7 @@ const svc = defineService<S, {
     noSuccess: true,
     canRsvp: false,
     cannotRsvp: true,
+    hideGuestRsvp: true,
     errored: false,
     notErrored: true,
     isLoading: true,

package/templates/nonprofit-cause/tier5-src/himi-store-account/index.ts

@@ -365,6 +365,11 @@ function authHeadline(s: S, isRegistering: boolean, isRecovering: boolean): { au
         authTitle: copyParam("storeAccount.authTitleRsvp", "Sign in to RSVP"),
         authBody: copyParam("storeAccount.authBodyRsvp", "Sign in to RSVP, then we’ll bring you back."),
       };
+    case "book":
+      return {
+        authTitle: copyParam("storeAccount.authTitleBook", "Sign in to book"),
+        authBody: copyParam("storeAccount.authBodyBook", "Sign in to book this time, then we’ll bring you back."),
+      };
     case "post":
       return {
         authTitle: copyParam("storeAccount.authTitlePost", "Sign in to post"),
@@ -392,7 +397,7 @@ interface S extends IapRestoreFields {
   noMemberImage: boolean;
   authTitle: string;
   authBody: string;
-  /** Mid-flow gate intent (`join_group` | `rsvp` | `post` | ""). */
+  /** Mid-flow gate intent (`join_group` | `rsvp` | `book` | `post` | ""). */
   authIntent: string;
   authContextName: string;
   returnScreenId: string;

package/templates/nonprofit-cause/tier5-src/wix-spaces-my-subscriptions/index.ts

@@ -9,7 +9,7 @@ interface S {
   status: "loading" | "ready";
   orders: Row[];
   emptyText: string;
-  /** When true, descriptor hides the guest-only "Go to Account" CTA (hiddenWhen). */
+  /** When true, descriptor hides the guest-only "Sign in" CTA (hiddenWhen). */
   hideAccountCta: boolean;
 }
 
@@ -19,7 +19,7 @@ function norm(o: WixPlanOrder): Row {
 }
 
 const EMPTY_MEMBER = "No subscriptions yet";
-const EMPTY_GUEST = "Sign in from Account to see subscriptions you’ve joined — we don’t invent sample memberships.";
+const EMPTY_GUEST = "Sign in to see the subscriptions you’ve joined — we don’t invent sample memberships.";
 const EMPTY_FORBIDDEN = "No subscriptions for this member yet.";
 
 /** The signed-in member's email, or "" for anyone else. A visitor's identity is