@wix/himalaya-cli 0.1613.0 → 0.1615.0

package/templates/gym-fitness/tier5-src/himi-booking-services/index.ts

@@ -3,7 +3,8 @@
 // Visitors browse every Wix Bookings service of the site, grouped by category under a small
 // title, in the business's own order (the order of the site's Book Online page). The category
 // chips are anchors, not filters: a tap scrolls the list to its category's title, and the chip
-// of the category at the top of the list lights up while the member scrolls. A name search
+// of the category at the top of the list lights up while the member scrolls. Opened with a
+// `category` nav param (a category tile), the list starts at that category. A name search
 // keeps the grouping. With two or more locations a pin limits the list to the services offered
 // at one location; the choice is shared with the Agenda and Choose Time screens. Each row
 // carries what the service record has: photo, name, tagline, a Class or Course tag, and
@@ -449,10 +450,57 @@ let activeCategory = "";
 let activeChosen = false;
 let scrollTarget = "";
 let jumps = 0;
+/** This worker run's own mark on its jump values. A renderer remembers the value it last jumped
+ *  for, and a screen restored from an earlier visit can bring that memory back: a value that
+ *  repeats across runs ("cat:x|1") would then be taken as done. Not in the state, so the boot
+ *  state (which a release hashes) does not change with the clock. */
+const RUN = Date.now().toString(36);
 let quietUntil = 0;
 /** How long a jump the worker asked for takes to settle: a top-row report inside it is the jump's
  *  own (the renderers suppress those, this is the belt to their braces). */
 const JUMP_SETTLE_MS = 900;
+/** The category this list was opened on (the `category` nav param: a category's Wix id, its
+ *  `name:<name>` key, or its name), e.g. from a category tile. Its chip lights and the list jumps
+ *  to its title once that group shows, and once more when this run's live page lands. After that
+ *  — or as soon as the member scrolls or taps a chip — the member leads.
+ *
+ *  Armed by the screen's own `load` (its onAppear), never by the boot request: the iOS and
+ *  Android lists act on a jump that CHANGES while they are on screen (a chip tap), and drop one
+ *  that is already in the state when they mount. The second jump is for a screen restored from
+ *  its last visit: the host puts back that visit's scroll position after the first one. */
+let pendingCategory = "";
+let bootLoad = true;
+/** This run's own live read has landed (a restored snapshot's rows do not count). */
+let liveLanded = false;
+let jumpedFromCache = false;
+/** The `category` param the list last started at, and that visit's `categoryActivation` (a
+ *  nonce a category tap sends, so a second tap on the SAME category is a new visit too). */
+let openedFor = "";
+let openedActivation = "";
+function inputParam(key: "category" | "categoryActivation"): string {
+  const value = (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.[key];
+  return typeof value === "string" ? value.trim().slice(0, 200) : "";
+}
+const inputCategory = (): string => inputParam("category");
+/** Read on every `load`, not once at boot: a pooled worker is handed the next screen's input just
+ *  before its `load` runs (the web host keeps one services worker for every push). The same param
+ *  again is the screen coming back (a pop, a refresh), which keeps the member's place. */
+function armCategory(): boolean {
+  const next = inputCategory();
+  const activation = inputParam("categoryActivation");
+  if (next === openedFor && activation === openedActivation) return false;
+  openedFor = next;
+  openedActivation = activation;
+  pendingCategory = next;
+  jumpedFromCache = false;
+  // A new visit is a new run for a pooled worker: the last visit's live page is not this one's,
+  // so the jump that waits for "this run's live read" waits for the read this load starts.
+  liveLanded = false;
+  // An open with no category ("See all") starts at the top: the last visit's lit chip and its
+  // jump do not carry over to it.
+  if (!next) { activeCategory = ""; activeChosen = false; scrollTarget = ""; }
+  return true;
+}
 
 // ---- Location ------------------------------------------------------------------------
 /** The member's choice (shared with Agenda and Choose Time through the on-device store). */
@@ -500,6 +548,17 @@ function display(s: S): S {
     ...section.rows.map((row) => ({ ...row, isSection: false, notSection: true, sectionTitle: "" })),
   ]);
   const chips = titled && sections.length >= 2 ? sections.map((section) => ({ id: section.id, label: section.title })) : [];
+  const live = liveLanded && !loading;
+  if (pendingCategory && chips.length && (live || !jumpedFromCache)) {
+    const opened = chips.find((chip) => chip.id === sectionIdOf(pendingCategory) || chip.label === pendingCategory);
+    if (opened) {
+      activeCategory = opened.id;
+      activeChosen = true;
+      scrollTarget = `${opened.id}|${RUN}.${++jumps}`;
+      quietUntil = Date.now() + JUMP_SETTLE_MS;
+      if (live) pendingCategory = ""; else jumpedFromCache = true;
+    }
+  }
   // No chips (a reload in flight, a single group): the lit chip waits for the list to come back.
   if (chips.length && (!activeChosen || !chips.some((chip) => chip.id === activeCategory))) activeCategory = chips[0]!.id;
   const target = scrollTarget.split("|")[0];
@@ -553,9 +612,15 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   register: registerServices,
   restorePagesOnLoad: true,
   onLoad() {
+    let reset: { query: string } | undefined;
+    if (bootLoad) bootLoad = false;
+    // A new visit at a category drops a search the member left on this list: a saved "massage"
+    // would hide the category the tile opened, and its jump would never land.
+    else if (armCategory() && pendingCategory) reset = { query: "" };
     // Copy is stashed before this hook. Repaint restored labels immediately, even
     // when the background query holds the old page through a slow or failed read.
     (svc as unknown as { normalizeRestored?: () => unknown }).normalizeRestored?.();
+    return reset;
   },
   state: { status: "loading", query: "", all: [], results: [], listRows: [], emptyText: "", countLabel: "", errored: false,
     notErrored: true, isLoading: true, notLoading: false, hasResults: false, noEmpty: true,
@@ -639,9 +704,10 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
         ?? ((p as { args?: { selectedIds?: unknown } } | undefined)?.args?.selectedIds);
       const picked = Array.isArray(ids) && typeof ids[0] === "string" ? ids[0] : activeCategory;
       if (!(s.categoryChips ?? []).some((chip) => chip.id === picked)) return s;
+      pendingCategory = "";
       activeCategory = picked;
       activeChosen = true;
-      scrollTarget = `${picked}|${++jumps}`;
+      scrollTarget = `${picked}|${RUN}.${++jumps}`;
       quietUntil = Date.now() + JUMP_SETTLE_MS;
       return display(s);
     },
@@ -653,6 +719,7 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
       if (!rows.some((row) => !row.isSection)) return s;
       const section = sectionOfRow(rows, argOf(p, "id"));
       if (!section || !(s.categoryChips ?? []).some((chip) => chip.id === section)) return s;
+      pendingCategory = "";
       activeCategory = section;
       activeChosen = true;
       // The member has moved on from the last jump: a re-render never scrolls back to it.
@@ -688,7 +755,7 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
     // Ended label the restored row for the same course showed, until a current pack replaces it.
     const shown = new Map((restoredEndedBridge && Array.isArray(s.results) ? s.results : []).map((row) => [row.id, row.endedText]));
     const rows = page.items.map((item) => withRowDefaults(item, shown.get(item.id)));
-    if (page.metadata?.fromCache === false && !loading && !errored) restoredEndedBridge = false;
+    if (page.metadata?.fromCache === false && !loading && !errored) { restoredEndedBridge = false; liveLanded = true; }
     const filtered = page.criteria.filter.startsWith("value:");
     const hasQuery = !!page.criteria.query.trim();
     // The menu offers every location of the whole catalog: a settled live read replaces it, the

package/templates/gym-fitness/tier5-src/himi-booking-time/index.ts

@@ -326,6 +326,9 @@ function inputId(): string {
  *  not just the first, because the boot load and the screen's own `load` can overlap. */
 /** Counts the customer's picks. A load that sees it move ran while they picked a time. */
 let selectionRevision = 0;
+// Each guest tap that asks the session first: only the newest answers, so two quick taps whose
+// reads come back out of order never pick the older time or open a second sign-in.
+let sessionTaps = 0;
 
 let pendingStart = (() => {
   const start = (globalThis as { himalaya?: { input?: { start?: unknown } } }).himalaya?.input?.start;
@@ -958,12 +961,13 @@ let dayRevision = 0;
 /** True while "Check Next Availability" searches; a second tap waits for the first. */
 let checkingNextLock = false;
 
-/** `{ slotId, signInScreenId }` from a pill tap (or a bare slot id). */
-function tapped(arg: unknown): { slotId: string; signInScreenId: string } {
-  if (typeof arg === "string") return { slotId: arg, signInScreenId: "" };
-  const a = (arg ?? {}) as { slotId?: unknown; id?: unknown; signInScreenId?: unknown };
+/** `{ slotId, signInScreenId, signInPresentation }` from a pill tap (or a bare slot id). */
+function tapped(arg: unknown): { slotId: string; signInScreenId: string; signInPresentation: "" | "sheet" | "full_screen" } {
+  if (typeof arg === "string") return { slotId: arg, signInScreenId: "", signInPresentation: "" };
+  const a = (arg ?? {}) as { slotId?: unknown; id?: unknown; signInScreenId?: unknown; signInPresentation?: unknown };
   const slotId = typeof a.slotId === "string" ? a.slotId : typeof a.id === "string" ? a.id : "";
-  return { slotId, signInScreenId: typeof a.signInScreenId === "string" ? a.signInScreenId : "" };
+  const presentation = a.signInPresentation === "sheet" || a.signInPresentation === "full_screen" ? a.signInPresentation : "";
+  return { slotId, signInScreenId: typeof a.signInScreenId === "string" ? a.signInScreenId : "", signInPresentation: presentation };
 }
 
 /** Select a bookable time, as a tap does: the pick-storage rules and the selection revision. */
@@ -1304,12 +1308,40 @@ const svc = defineService<S, {
     // taps it again. Where the regular checkout is not allowed, the tap selects the time for the
     // in-app purchase button.
     pickSlot: async (s, arg): Promise<S | undefined> => {
-      const { slotId, signInScreenId } = tapped(arg);
+      const { slotId, signInScreenId, signInPresentation } = tapped(arg);
       if (bookingLock || s.bookingInFlight || !allRows.some((row) => row.id === slotId && row.selectable)) return derive(s);
       const selected = selectSlotIn(s, slotId);
-      if (!s.isMember) {
+      // A modal sign-in leaves this screen in place: a host need not run its onAppear when the
+      // sheet closes, and the reload that refreshes `isMember` can still be running. So ask the
+      // session before opening the sheet again, or a member's tap would only reopen it. Only the
+      // session's own identity counts here, never getMyData: that can still answer with a stale
+      // site or owner profile for a visitor. A member found here gets the pick and the "tap again"
+      // note, as after a reload, and books on the next tap: that tap passes the booking lock and
+      // the offline guard with the member state, which this await would let a second tap skip.
+      if (!selected.isMember && signInScreenId && signInPresentation) {
+        const mine = ++sessionTaps;
+        const email = await signedInEmail();
+        if (mine !== sessionTaps) return undefined;
+        // From the state as it is NOW: a reload may have landed during the await. The pick
+        // stays only while that time is still bookable.
+        const now = svc.getState?.() ?? s;
+        const open = allRows.some((row) => row.id === slotId && row.selectable);
+        if (email) {
+          return derive({ ...(open ? selectSlotIn(now, slotId) : now), isMember: true, identityLine: email, email,
+            message: open ? copyParam("time.signedInTapAgain", "Signed in. Tap the time again to book it.") : "" });
+        }
+        // Still a guest: the sign-in opens over the newest state; a time gone meanwhile opens nothing.
+        if (!open) return derive(now);
+        return navigate(selectSlotIn(now, slotId), { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", intent: "book", modal: "1" } });
+      }
+      if (!selected.isMember) {
         // Branded Lite opens its sign-in screen; other apps show the sign-in card on this screen.
-        return signInScreenId ? navigate(selected, { screenId: signInScreenId, args: { mode: "signin", intent: "book" } }) : selected;
+        // With a presentation it opens as a modal (`modal`: the sign-in worker closes it after a
+        // sign-in), and this screen loads again under it with the guest's pick kept.
+        if (!signInScreenId) return selected;
+        return navigate(selected, signInPresentation
+          ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", intent: "book", modal: "1" } }
+          : { screenId: signInScreenId, args: { mode: "signin", intent: "book" } });
       }
       const regular = regularCheckoutAllowed || applePurchase.usesRegularPlatform();
       if (!regular && !waitlistIds.has(slotId)) {

package/templates/gym-fitness/tier5-src/himi-branded-lite-agenda/index.ts

@@ -650,6 +650,9 @@ async function settled(next: S | undefined): Promise<S | undefined> {
 
 /** How the app opens its sign-in screen, from the appear params ("" = push). */
 let signInPresentation: "" | "sheet" | "full_screen" = "";
+/** The app's sign-in screen (`signInScreenId` appear param): Branded Lite's `himi_sign_in` by
+ *  default; an app with no such screen names its own (salon-spa: the Profile tab, `himi_account`). */
+let signInScreenId = "himi_sign_in";
 
 const svc = defineService<S, {
   load: (s: S, p?: unknown) => Promise<S | undefined>;
@@ -678,6 +681,8 @@ const svc = defineService<S, {
       stashCopy(p);
       const presentation = argOf(p, "signInPresentation");
       if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
+      const signInScreen = argOf(p, "signInScreenId");
+      if (/^[a-z][a-z0-9_]{0,63}$/.test(signInScreen)) signInScreenId = signInScreen;
       const fw = Number(argOf(p, "firstWeekday") || s.firstWeekday);
       const today = dayKey(new Date());
       // First appearance: open on this week. A re-appearance keeps the member's place and
@@ -878,8 +883,8 @@ const svc = defineService<S, {
           busy = false;
           // As a modal it only closes, and this screen loads again (its re-appearance reload).
           return navigate(s, signInPresentation
-            ? { screenId: "himi_sign_in", presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
-            : { screenId: "himi_sign_in", args: { mode: "signin", returnScreenId: "himi_agenda" } });
+            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+            : { screenId: signInScreenId, args: { mode: "signin", returnScreenId: "himi_agenda" } });
         }
         const name = await memberName();
         const current = await memberAccess().catch(() => undefined);

package/templates/gym-fitness/tier5-src/himi-branded-lite-home/index.ts

@@ -9,7 +9,14 @@ import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { queryServices, type WixService } from "@himalaya/wix-bookings";
 import { getPost, queryPosts, type WixPost } from "@himalaya/wix-blog";
 import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
-import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
+import {
+  listMyParticipations,
+  participationsByProgram,
+  queryJoinApplications,
+  queryPrograms,
+  type WixProgram,
+} from "@himalaya/wix-online-programs";
+import { getMyMember } from "@himalaya/wix-members";
 import { listFeedItems, type WixFeedItem, type WixFeedProfile } from "@himalaya/wix-social-feed";
 import { queryItems as queryMenuItems, querySections as queryMenuSections } from "@himalaya/wix-restaurants";
 import { normalizeEvent, queryEvents } from "../_shared/himi-events.js";
@@ -166,6 +173,13 @@ interface ProgramCard {
   noImage: boolean;
 }
 
+/** A member's own program state, kept separate from the visitor catalog cards. */
+interface MemberProgramCard extends ProgramCard {
+  stateLabel: string;
+  progressFraction: number;
+  hideProgress: boolean;
+}
+
 /** A communityPulse latest-activity Carousel card (design §4.5). */
 interface FeedHighlight {
   id: string;
@@ -308,6 +322,8 @@ interface State {
   noNextEvent: boolean;
   homePrograms: ProgramCard[];
   noHomePrograms: boolean;
+  memberPrograms: MemberProgramCard[];
+  noMemberPrograms: boolean;
   /** The videos module's carousel — the newest ready Wix Video videos, the channels
    *  taking turns. Guarded on `videos`; same silent-fail contract. */
   homeVideos: (WixVideoCard & CaptionFlags)[];
@@ -549,6 +565,7 @@ interface ExtrasSignal {
   upcomingEvents: EventEntry[];
   nextEventCards: NextEventCard[];
   homePrograms: ProgramCard[];
+  memberPrograms: MemberProgramCard[];
   homeVideos: (WixVideoCard & CaptionFlags)[];
   feedHighlights: FeedHighlight[];
   memberAvatars: CoachAvatar[];
@@ -559,8 +576,17 @@ interface ExtrasSignal {
   menuCategories: MenuCategory[];
 }
 
+let homeProgramCandidates: { generation: number; programs: WixProgram[] } = { generation: 0, programs: [] };
+/** A finite number from a progress field, or `fallback` when the read left it out or sent junk. */
+function finiteOr(value: unknown, fallback: number): number {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+
+/** How many microtask turns `memberProgramsLoaded` waits for refresh's own result to land (see the action). */
+const MEMBER_PROGRAMS_APPLY_RETRIES = 50;
+
 function emptyExtrasSignal(): ExtrasSignal {
-  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
+  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], memberPrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
 }
 
 /** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
@@ -670,13 +696,13 @@ async function fetchUpcomingEvents(): Promise<{ entries: EventEntry[]; nextEvent
   }
 }
 
-async function fetchHomePrograms(): Promise<ProgramCard[]> {
+async function fetchHomePrograms(): Promise<{ cards: ProgramCard[]; programs: WixProgram[] }> {
   try {
     const response = await queryPrograms({ cursorPaging: { limit: 12 } });
-    return (response.programs ?? [])
+    const programs = (response.programs ?? [])
       .filter((p: WixProgram) => ((p.state ?? p.status ?? "").toUpperCase()) !== "DRAFT")
-      .slice(0, 6)
-      .map((p: WixProgram) => {
+      .slice(0, 12);
+    const cards = programs.slice(0, 6).map((p: WixProgram) => {
         const desc = (p as { description?: unknown }).description;
         const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
         const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
@@ -692,7 +718,112 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
           noImage: !image,
         };
       });
+    return { cards, programs };
   } catch {
+    return { cards: [], programs: [] };
+  }
+}
+
+/** Member state is best-effort Home enrichment: visitors and unsupported member sessions
+ * collapse the rail, while the public Programs section remains available. */
+async function fetchMemberProgramCards(programs: WixProgram[]): Promise<MemberProgramCard[]> {
+  try {
+    const member = await memberAccess();
+    if (!member.email) return [];
+    const memberId = (await getMyMember()).member?.id;
+    if (!memberId) return [];
+
+    const [participantResult, applicationResult] = await Promise.allSettled([
+      listMyParticipations(memberId, { maxPages: 2 }),
+      queryJoinApplications({ memberId, limit: 100 }),
+    ]);
+    // These are independent member reads. An unverified participant-query permission
+    // must not also hide applications that the member-scoped endpoint can return.
+    const participants = participantResult.status === "fulfilled" ? participantResult.value : [];
+    const applications = applicationResult.status === "fulfilled" ? applicationResult.value : { joinApplications: [] };
+    const participation = participationsByProgram(participants);
+    // An application that already became a participant keeps its status and carries `participantId`
+    // (the SDK's PENDING_JOIN_APPLICATION_STATUSES note): the participation is the standing, and a member
+    // who later left must not read as "Approved" from the application that once admitted them. Newest
+    // first, one per program, and only programs with no participation of their own — so the admitted
+    // rows a joined member accumulates never take the lookup slots of a real pending request.
+    const applicationByProgram = new Map<string, { status?: string }>();
+    for (const application of applications.joinApplications ?? []) {
+      if (!application.programId || application.participantId || participation.has(application.programId)) continue;
+      if (!applicationByProgram.has(application.programId)) applicationByProgram.set(application.programId, application);
+    }
+    // The public catalog preview is intentionally capped at 12. Resolve the
+    // member's six most recent enrolled programs and six open applications
+    // outside that window in one filtered query so both remain visible.
+    const knownIds = new Set(programs.map((program) => program.id).filter((id): id is string => !!id));
+    const participantProgramIds = [...participation.keys()].slice(0, 6);
+    const applicationProgramIds = [...applicationByProgram.keys()].filter((id) => !participantProgramIds.includes(id)).slice(0, 6);
+    const candidateIds = [...participantProgramIds, ...applicationProgramIds].slice(0, 12);
+    const missingIds = candidateIds.filter((id) => !knownIds.has(id));
+    const extraPrograms = missingIds.length
+      ? await queryPrograms({ filter: { id: { $in: missingIds } }, cursorPaging: { limit: missingIds.length } })
+          .then((response) => response.programs ?? []).catch(() => [])
+      : [];
+    const memberPrograms = [...programs, ...extraPrograms.filter((program) => !!program.id && !knownIds.has(program.id))];
+    await assertMemberAccess(member);
+
+    return memberPrograms.flatMap((program) => {
+      if (!program.id) return [];
+      const participant = participation.get(program.id);
+      const application = applicationByProgram.get(program.id);
+      if (!participant && !application) return [];
+      const desc = (program as { description?: unknown }).description;
+      const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
+      const name = cleanTitle(program.settings?.title ?? nestedTitle ?? program.title) || copyParam("home.programFallbackName", "Program");
+      const image = programImage(program);
+      // Progress may be absent (a `fields` the read did not ask for, or a program with no steps): the
+      // bar then sits at 0 and the label comes from `progressStatus`, never from NaN arithmetic.
+      const available = finiteOr(participant?.progress?.totalStepsAvailable, 0);
+      const completed = finiteOr(participant?.progress?.totalStepsCompleted, 0);
+      const percentage = finiteOr(participant?.progress?.completionPercentage, Number.NaN);
+      const hasProgress = available > 0 || Number.isFinite(percentage);
+      const rawFraction = available > 0 ? completed / available : Number.isFinite(percentage) ? percentage / 100 : 0;
+      const progressFraction = Math.max(0, Math.min(1, rawFraction));
+      let stateLabel: string;
+      if (participant) {
+        const enrollmentStatus = (participant.enrollmentStatus ?? "").toUpperCase();
+        const progressStatus = (participant.progressStatus ?? "").toUpperCase();
+        stateLabel = enrollmentStatus === "SUSPENDED"
+          ? copyParam("home.memberProgramSuspended", "Access paused")
+          : progressStatus === "COMPLETED" || enrollmentStatus === "COMPLETED"
+          ? copyParam("home.memberProgramCompleted", "Completed")
+          : progressStatus === "FAILED"
+            ? copyParam("home.memberProgramFailed", "Failed")
+          : progressStatus === "IN_PROGRESS" || (progressStatus !== "NOT_STARTED" && progressFraction > 0)
+            ? copyParam("home.memberProgramInProgress", "In progress")
+            : copyParam("home.memberProgramNotStarted", "Not started");
+      } else {
+        const status = (application?.status ?? "").toUpperCase();
+        stateLabel = status === "INVITED"
+          ? copyParam("home.memberProgramInvited", "Invitation")
+          : status === "APPROVED"
+            ? copyParam("home.memberProgramApproved", "Approved")
+            : status === "SUSPENDED"
+              ? copyParam("home.memberProgramSuspended", "Access paused")
+            : copyParam("home.memberProgramPending", "Request pending");
+      }
+      return [{
+        id: program.id,
+        name,
+        description: "",
+        image,
+        initial: initials(name),
+        hasImage: !!image,
+        noImage: !image,
+        stateLabel,
+        progressFraction,
+        hideProgress: !hasProgress || !participant || (participant.enrollmentStatus ?? "").toUpperCase() === "SUSPENDED",
+      }];
+    });
+  } catch (error) {
+    // The member rail is optional; never let a member-state refusal blank public Home.
+    const status = (error as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(error))?.[1];
+    console.warn("[home.member-programs] member state unavailable", status !== undefined ? `HTTP ${String(status)}` : (error as { name?: string } | null)?.name ?? "unknown");
     return [];
   }
 }
@@ -747,7 +878,7 @@ function groupCard(group: WixGroup): GroupCard {
   };
 }
 
-async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
+async function fetchExtrasSignal(arg: unknown, generation: number): Promise<ExtrasSignal> {
   const verticals = parseVerticals(arg);
   const extras = emptyExtrasSignal();
   const jobs: Promise<void>[] = [];
@@ -758,7 +889,12 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
     }));
   }
   if (verticals.includes("programs")) {
-    jobs.push(fetchHomePrograms().then((cards) => { extras.homePrograms = cards; }));
+    jobs.push(fetchHomePrograms().then(({ cards, programs }) => {
+      extras.homePrograms = cards;
+      // An older refresh can finish this query after a newer one. Keep its
+      // candidates from replacing the current generation's member-read input.
+      if (generation === refreshGen) homeProgramCandidates = { generation, programs };
+    }));
   }
   if (verticals.includes("videos") && !videoSurfaceRefused) {
     const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
@@ -883,6 +1019,7 @@ function derive(state: State): State {
     noUpcomingEvents: state.upcomingEvents.length === 0,
     noNextEvent: state.nextEventCards.length === 0,
     noHomePrograms: state.homePrograms.length === 0,
+    noMemberPrograms: state.memberPrograms.length === 0,
     noHomeVideos: state.homeVideos.length === 0,
     noFeedHighlights: state.feedHighlights.length === 0,
     noMemberAvatars: state.memberAvatars.length === 0,
@@ -977,6 +1114,8 @@ function baseState(): State {
     noNextEvent: true,
     homePrograms: [],
     noHomePrograms: true,
+    memberPrograms: [],
+    noMemberPrograms: true,
     homeVideos: [],
     noHomeVideos: true,
     feedHighlights: [],
@@ -1026,7 +1165,7 @@ async function refreshPublic(state: State, arg?: unknown): Promise<State | undef
   // failure just collapses their blocks), so a store outage cannot blank them
   // and vice versa. paramValue() stashes the appear params on first read, so the
   // arg-less fallback below still resolves the stashed verticals.
-  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg), fetchSavedSignal(arg)]);
+  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg, gen), fetchSavedSignal(arg)]);
   if (gen !== refreshGen) return undefined;
   // A screen that declares no "store" vertical renders no products rail, so there is
   // nothing to fetch and nothing that could be "not loaded" — skip the call outright
@@ -1186,8 +1325,17 @@ async function refresh(state: State, arg?: unknown): Promise<State | undefined>
   void refreshPersonal(generation, arg);
   const publicState = await refreshPublic(state, arg);
   if (!publicState || generation !== personalGeneration) return undefined;
+  // The member-only read runs after public Home has landed. It is deliberately not awaited:
+  // a slow member endpoint must not hold the public catalog or hero behind authentication.
+  const programCandidates = homeProgramCandidates;
+  if (programCandidates.generation === refreshGen && parseVerticals(arg).includes("programs")) {
+    void fetchMemberProgramCards(programCandidates.programs).then((rows) => {
+      void svc.memberProgramsLoaded({ generation: programCandidates.generation, rows });
+    });
+  }
   const current = svc.getState();
-  return derive({ ...publicState, nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
+  return derive({ ...publicState, memberPrograms: current.memberPrograms, noMemberPrograms: current.noMemberPrograms,
+    nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
     memberProgressLabel: current.memberProgressLabel, memberProgressFraction: current.memberProgressFraction,
     hideMemberProgress: current.hideMemberProgress, personalError: current.personalError, hidePersonalError: current.hidePersonalError,
     // The weekly goal is PERSONAL (member bookings); the public refresh resets it, so keep it.
@@ -1214,6 +1362,7 @@ const svc = defineService<State, {
   refresh: (state: State, arg?: unknown) => Promise<State | undefined>;
   dismissOnboarding: (state: State) => State;
   clearPersonal: (state: State) => State;
+  memberProgramsLoaded: (state: State, arg: { generation: number; rows: MemberProgramCard[]; attempt?: number }) => State | undefined;
   openShopCategory: (state: State, arg?: unknown) => State;
   personalLoaded: (state: State, arg: { generation: number; rows: MemberBookingRow[]; progress: { label: string; fraction: number }; error: boolean; weekly: { count: number; fraction: number; label: string } | null }) => State;
   categoriesLoaded: (state: State, arg: { generation: number; categories: StoreCategoryCard[] }) => State | undefined;
@@ -1221,10 +1370,27 @@ const svc = defineService<State, {
   state: baseState(),
   // The host's site is read fresh at every boot: a snapshot of the last session's site must not
   // decide this one's verticals or name (an owner installs or removes one; another site opens).
-  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories"],
+  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories", "memberPrograms", "noMemberPrograms"],
+  // A member's standing never reaches the on-device snapshot either: the next boot may be another member's.
+  notPersisted: ["memberPrograms", "noMemberPrograms"],
   actions: {
-    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, personalError: false, hidePersonalError: true,
+    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, memberPrograms: [], noMemberPrograms: true, personalError: false, hidePersonalError: true,
       weeklyClassCount: 0, weeklyClassGoalFraction: 0, weeklyGoalLabel: "" }),
+    // The member read starts inside `refresh` and, for a visitor (identity answers synchronously),
+    // resolves within the same microtask turn — BEFORE the runtime has applied refresh's own result.
+    // The `state` handed here is then refresh's PRE-state (status "loading", every rail empty), and
+    // spreading it wrote a loading home over the ready one; the description-projection test caught
+    // exactly that. So an early arrival re-queues itself (a microtask at a time, bounded) until the
+    // state it would spread is the applied one. A stale generation keeps the current state
+    // (`undefined`), never its own stale snapshot.
+    memberProgramsLoaded: (state, arg) => {
+      if (arg.generation !== refreshGen) return undefined;
+      if (state.status === "loading" && (arg.attempt ?? 0) < MEMBER_PROGRAMS_APPLY_RETRIES) {
+        void Promise.resolve().then(() => svc.memberProgramsLoaded({ ...arg, attempt: (arg.attempt ?? 0) + 1 }));
+        return undefined;
+      }
+      return derive({ ...state, memberPrograms: arg.rows, noMemberPrograms: arg.rows.length === 0 });
+    },
     openShopCategory: (state, arg) => {
       const category = String((arg as { category?: unknown } | undefined)?.category ?? "");
       if (!category) return state;

package/templates/nonprofit-cause/tier5-src/_shared/branded-load-state.ts

@@ -35,11 +35,14 @@ export interface LoadFlags {
   notMock: boolean;
   notMockEmpty: boolean;
   notMockUnavailable: boolean;
+  /** hiddenWhen gate for the empty state: false ONLY when the site answered with no rows
+   *  (`notMockEmpty` is true then — it gates the sample banner, not the empty state). */
+  hideEmpty: boolean;
 }
 
 export const LOADING: LoadFlags = {
   status: "loading", error: "", signInRequired: false, notErrored: true, notLoading: false, busy: true, noSignIn: true,
-  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true,
+  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true, hideEmpty: true,
 };
 
 const READY: LoadFlags = { ...LOADING, status: "ready", notLoading: true, busy: false };
@@ -78,7 +81,7 @@ type Rows<K extends string, T> = { [P in K]: T[] } & { emptyText: string } & Loa
 export function loaded<K extends string, T>(key: K, rows: T[], copy: LoadCopy<T>): Rows<K, T> {
   if (rows.length) return { ...READY, [key]: rows, emptyText: "" } as Rows<K, T>;
   if (samplesRequested()) return sampleRows(key, copy, "empty");
-  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty) } as Rows<K, T>;
+  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty), hideEmpty: false } as Rows<K, T>;
 }
 
 /** A query threw. Never rows the customer did not create. */

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

@@ -1,6 +1,8 @@
 import { dispatch } from "@himalaya/dispatch";
 // Relative for node resolution (see himi-store.ts note); rewritten off-repo.
 import { displayName, getMyData, initials, type WixMyData } from "@himalaya/wix-users";
+import { getMyMember } from "@himalaya/wix-members";
+import { wixMediaUrl } from "@himalaya/wix-media";
 import { formatDateMedium, formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
 export interface AccountProfile {
@@ -82,6 +84,31 @@ function profileFromData(data: WixMyData, fallbackEmail = ""): AccountProfile {
   };
 }
 
+/** The signed-in site member's name and photo from their member record, or undefined when it
+ *  cannot be read or names nobody (the caller then shows the email). */
+async function siteMemberProfile(email: string): Promise<AccountProfile | undefined> {
+  try {
+    const member = (await getMyMember({ fieldsets: ["FULL"] }))?.member;
+    const name = [member?.contact?.firstName, member?.contact?.lastName].map((part) => (part ?? "").trim()).filter(Boolean).join(" ")
+      || (member?.profile?.nickname ?? "").trim();
+    if (!name) return undefined;
+    const image = wixMediaUrl(member?.profile?.photo?.url) || wixMediaUrl(member?.profile?.photo?.id) || "";
+    return {
+      isMember: true,
+      identityLine: "Signed in",
+      detailLine: email || name,
+      memberName: name,
+      memberEmail: email || member?.loginEmail || "",
+      memberImage: image,
+      memberInitials: initialsFromName(name) || "M",
+      hasMemberImage: !!image,
+      noMemberImage: !image,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 export function guestProfile(detailLine: string): AccountProfile {
   return {
     isMember: false,
@@ -118,6 +145,10 @@ export async function loadMemberProfile(guestDetailLine: string): Promise<Accoun
     const data = await getMyData();
     return profileFromData(data, storedEmail);
   } catch {
+    // The account profile is an owner endpoint: the web host refuses it, and a site member need
+    // not have one. The member's own record (the Members API) still names them.
+    const member = await siteMemberProfile(storedEmail);
+    if (member) return member;
     return {
       isMember: true,
       identityLine: "Signed in",