@wix/himalaya-cli 0.1388.0 → 0.1390.0

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

@@ -3300,6 +3300,93 @@ const SCREENS = runtimeSetting({
                         "accessibilityLabel": "My subscriptions"
                       }
                     },
+                    {
+                      "id": "himi_account.restore",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 12,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "refresh",
+                                  "size": 18,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiStoreAccount.restoreLabel",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Spacer",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceElevated"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8,
+                        "padding": {
+                          "leading": 14,
+                          "trailing": 14,
+                          "top": 13,
+                          "bottom": 13
+                        },
+                        "onTap": {
+                          "actionId": "tier5.himiStoreAccount.iapRestore"
+                        },
+                        "pressFeedback": "scale",
+                        "haptic": "light",
+                        "accessibilityLabel": "$service:himiStoreAccount.restoreLabel",
+                        "hiddenPath": "$service:himiStoreAccount.restoreHidden"
+                      }
+                    },
+                    {
+                      "id": "himi_account.restore_message",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiStoreAccount.restoreMessage",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiStoreAccount.restoreHidden"
+                      }
+                    },
                     {
                       "id": "himi_account.addresses",
                       "body": {
@@ -3729,6 +3816,109 @@ const SCREENS = runtimeSetting({
                 "hiddenPath": "$service:himiStoreAccount.isMember"
               }
             },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "himi_account.restore_guest",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 12,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "refresh",
+                                  "size": 18,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiStoreAccount.restoreLabel",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Spacer",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceElevated"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8,
+                        "padding": {
+                          "leading": 14,
+                          "trailing": 14,
+                          "top": 13,
+                          "bottom": 13
+                        },
+                        "onTap": {
+                          "actionId": "tier5.himiStoreAccount.iapRestore"
+                        },
+                        "pressFeedback": "scale",
+                        "haptic": "light",
+                        "accessibilityLabel": "$service:himiStoreAccount.restoreLabel",
+                        "hiddenPath": "$service:himiStoreAccount.restoreHidden"
+                      }
+                    },
+                    {
+                      "id": "himi_account.restore_guest_message",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiStoreAccount.restoreMessage",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiStoreAccount.restoreHidden"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreAccount.isMember"
+              }
+            },
             {
               "id": "himi_account.language",
               "body": {
@@ -4098,6 +4288,7 @@ const SCREENS = runtimeSetting({
           "actionId": "tier5.himiStoreAccount.refresh",
           "params": {
             "memberAccountLinks": "1",
+            "restorePurchases": "1",
             "copy": "{\"account.subtitle\":\"Orders, bookings, memberships and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — cart, bookings and memberships stay with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — cart, bookings and memberships stay with you.\"}"
           }
         }
@@ -4109,7 +4300,8 @@ const SCREENS = runtimeSetting({
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "app_info"
+        "app_info",
+        "iap"
       ],
       "minBinaryVersion": "0.2.0",
       "bundleVersion": "0.0.1"

package/templates/beauty-salon/tier5-src/_shared/iap-worker.ts

@@ -2,9 +2,9 @@
 // `@himalaya/iap-checkout` → createIapCommerce), shared by every screen that shows or sells an
 // IAP-backed item. Mapping, Apple prices, payment guards, the host scope and the sale live in the
 // SDK; this only supplies the copy and the hydration reset.
-import type { IapPriceCopy } from "@himalaya/iap";
-import type { IapPurchaseCopy } from "@himalaya/iap-checkout";
-import { copyParam } from "./himi-copy.js";
+import { hostSessionFromGlobal, type IapPriceCopy } from "@himalaya/iap";
+import type { IapCommerce, IapPurchaseCopy, IapRestoreResult } from "@himalaya/iap-checkout";
+import { copyParam, copyTemplate } from "./himi-copy.js";
 
 /** Price labels from the screen's copy pack (`<prefix>.priceLoadingText`, …). */
 export function iapPriceCopy(prefix: string): IapPriceCopy {
@@ -31,6 +31,87 @@ export function iapPurchaseCopy(prefix: string): IapPurchaseCopy {
   };
 }
 
+/** The Restore purchases control (App Review 3.1.1) a screen binds. */
+export interface IapRestoreFields {
+  restoreHidden: boolean;
+  restoreLabel: string;
+  restoreDisabled: boolean;
+  restoreMessage: string;
+}
+
+/** Keep these out of hydration: a restore's answer belongs to the run that got it. */
+export const IAP_RESTORE_KEYS = ["restoreHidden", "restoreLabel", "restoreDisabled", "restoreMessage"] as const;
+
+/** The control before the screen knows it sells through Apple. */
+export const NO_IAP_RESTORE: IapRestoreFields = { restoreHidden: true, restoreLabel: "", restoreDisabled: false, restoreMessage: "" };
+
+export interface IapRestoreControl {
+  /** `sellsThroughApple` is the screen's own signal: its item's App Store route, or Account's
+   *  purchase readiness. */
+  fields(sellsThroughApple: boolean): IapRestoreFields;
+  /** Runs the shared `commerce.restore()`, repainting as it starts and when it answers. A tap while
+   *  one runs is ignored. */
+  run(): Promise<void>;
+}
+
+/** Copy from the screen's pack (`<prefix>.restorePurchasesCta`, …). The restore itself, and the access
+ *  re-read after it, are the shared commerce's. */
+export function createIapRestore(
+  commerce: Pick<IapCommerce, "restore">,
+  options: { prefix: string; repaint(): void; /** The session generation; defaults to the host's. */ generation?: () => number },
+): IapRestoreControl {
+  const generation = options.generation ?? (() => hostSessionFromGlobal().current().generation);
+  let running = false;
+  let message = "";
+  let messageGeneration = -1;
+
+  function say(text: string, forGeneration: number): void {
+    message = text;
+    messageGeneration = forGeneration;
+  }
+
+  async function run(): Promise<void> {
+    if (running) return;
+    running = true;
+    const startedFor = generation();
+    say(copyParam(`${options.prefix}.restoringText`, "Restoring…"), startedFor);
+    options.repaint();
+    // Stamped with the session the tap was for: an answer landing after a sign-out is never shown.
+    say(restoreMessage(await restored(commerce), options.prefix), startedFor);
+    running = false;
+    options.repaint();
+  }
+
+  return {
+    fields: (sellsThroughApple) => ({
+      restoreHidden: !sellsThroughApple,
+      restoreLabel: copyParam(`${options.prefix}.restorePurchasesCta`, "Restore purchases"),
+      restoreDisabled: running,
+      // The answer was for the person signed in when it ran; another session never inherits it.
+      restoreMessage: sellsThroughApple && messageGeneration === generation() ? message : "",
+    }),
+    run,
+  };
+}
+
+function restored(commerce: Pick<IapCommerce, "restore">): Promise<IapRestoreResult> {
+  return commerce.restore().catch(() => ({ status: "failed", code: "storeUnavailable" }) as const);
+}
+
+function restoreMessage(result: IapRestoreResult, prefix: string): string {
+  if (result.status === "needsSignIn") return copyParam(`${prefix}.restoreSignInText`, "Sign in to restore your purchases.");
+  if (result.status === "failed") return result.code === "sessionChanged" ? "" : copyParam(`${prefix}.restoreFailedText`, "Couldn't reach the App Store. Try again.");
+  // Every part that happened is said: a recovery never hides a refusal or a purchase still pending.
+  const parts = [
+    result.recovered === 1 ? copyParam(`${prefix}.restoredOneText`, "Restored 1 purchase.") : "",
+    result.recovered > 1 ? copyTemplate(`${prefix}.restoredManyText`, "Restored {count} purchases.", { count: result.recovered }) : "",
+    // Held unfinished because Wix refused it (another member's purchase, say).
+    result.refused > 0 ? copyParam(`${prefix}.restoreRefusedText`, "A purchase on this Apple ID couldn't be added to this account. Contact support.") : "",
+    result.pending > 0 ? copyParam(`${prefix}.restorePendingText`, "A purchase is still being confirmed. Try again in a moment.") : "",
+  ].filter(Boolean);
+  return parts.length ? parts.join(" ") : copyParam(`${prefix}.restoreUpToDateText`, "Your purchases are up to date.");
+}
+
 /** What `notHydrated` does, for a runtime that ignores the option (a binary older than it, still
  *  served new bundles): put the listed keys back to their declared values before any action runs,
  *  so a persisted price or an enabled purchase action never paints as this run's. */

package/templates/beauty-salon/tier5-src/himi-store-account/index.ts

@@ -14,6 +14,8 @@ import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { memberAccountRoutes } from "../_shared/member-account-routes.js";
+import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleSalesEnabled, storesProductOrders } from "@himalaya/iap-checkout";
+import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
 
 interface AuthRouteInput {
   intent?: string;
@@ -152,7 +154,7 @@ function authHeadline(s: S, isRegistering: boolean, isRecovering: boolean): { au
   }
 }
 
-interface S {
+interface S extends IapRestoreFields {
   status: "loading" | "ready";
   isMember: boolean;
   notMember: boolean;
@@ -214,6 +216,27 @@ interface S {
   noMemberAddresses: boolean;
   /** Hides My Wallet where this runtime cannot reach saved cards. */
   noMemberWallet: boolean;
+  /** Set once a descriptor asks for the Restore purchases row (appear param
+   *  `restorePurchases: "1"`). Only then does the worker reach the App Store layer, so a
+   *  descriptor that renders no such row need not declare `iap`. */
+  restorePurchases: boolean;
+}
+
+// Restore purchases (App Review 3.1.1) for every vertical the app sells through the App Store. The
+// row shows once purchasing is ready on this host (a bound iOS binary with managed StoreKit), to a
+// guest too: the restore itself asks them to sign in.
+const commerce = createIapCommerce({
+  adapters: [onlineProgramOrders, pricingPlanOrders, ...(storesAppleSalesEnabled() ? [storesProductOrders] : [])],
+  onChange: () => { void svc.restorePublish(); },
+});
+const restore = createIapRestore(commerce, { prefix: "storeAccount", repaint: () => { void svc.restorePublish(); } });
+let commerceEntered = false;
+
+/** The first entry reads readiness and recovers held purchases; later ones reconcile, as on any
+ *  screen that sells. */
+function enterCommerce(): void {
+  void (commerceEntered ? commerce.reconcile() : commerce.start());
+  commerceEntered = true;
 }
 
 function derive(s: S): S {
@@ -234,6 +257,7 @@ function derive(s: S): S {
     hideSignInChoices: isRegistering || isRecovering,
     hasActivity,
     noActivity: !hasActivity,
+    ...restore.fields(s.restorePurchases && commerce.readiness().status === "ready"),
     authTitle: headline.authTitle,
     authBody: headline.authBody,
     hasReturnPath,
@@ -288,6 +312,8 @@ async function probe(s: S, arg?: unknown): Promise<S> {
   const intent = authIntentFromArg(arg, s);
   const profile = await loadMemberProfile(copyParam("storeAccount.guestDetail", "Sign in to keep your cart and orders connected."));
   const memberAccountLinks = s.memberAccountLinks || strField(arg, "memberAccountLinks") === "1";
+  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
+  if (restorePurchases) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -313,6 +339,7 @@ async function probe(s: S, arg?: unknown): Promise<S> {
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
+    restorePurchases,
     noMemberAddresses: !routes.addresses,
     noMemberWallet: !routes.wallet,
     activityRows,
@@ -365,7 +392,10 @@ const svc = defineService<S, {
   signIn: (s: S) => Promise<S | undefined>;
   register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
+  restorePublish: (s: S) => S;
+  iapRestore: (s: S) => Promise<undefined>;
 }>("himiStoreAccount", {
+  notHydrated: [...IAP_RESTORE_KEYS],
   state: derive({
     status: "loading",
     isMember: false,
@@ -411,6 +441,8 @@ const svc = defineService<S, {
     memberAccountLinks: false,
     noMemberAddresses: true,
     noMemberWallet: true,
+    restorePurchases: false,
+    ...NO_IAP_RESTORE,
   }),
   actions: {
     load: (s, arg) => { stashCopy(arg); return probe(s, arg); },
@@ -503,8 +535,11 @@ const svc = defineService<S, {
       };
       return derive(cleared);
     },
+    restorePublish: (s) => derive(s),
+    iapRestore: async () => { await restore.run(); return undefined; },
   },
 });
 
+resetUnhydratedKeysOnOlderRuntime(svc, { ...svc.getState(), ...NO_IAP_RESTORE }, IAP_RESTORE_KEYS);
 svc.load();
 export { svc };

package/templates/beauty-salon-owner/config.ts

@@ -41,6 +41,17 @@ export default defineApp({
   designTokensPath: "./tokens.json",
   navigation: {
     "navKind": "responsive",
+    "surfaces": {
+      "watch": {
+        "destinations": [
+          "home"
+        ],
+        "navKind": "single",
+        "screenIds": {
+          "home": "himi_owner_lite_wrist_home"
+        }
+      }
+    },
     "scheme": "himalaya-__HIMI_APP_SLUG__",
     "deepLinkPatterns": [],
     "linkableScreens": [