@wix/himalaya-cli 0.1574.0 → 0.1575.0

package/templates/community-club-owner/dev/index.ts

@@ -78486,6 +78486,7 @@ const SCREENS = runtimeSetting({
                         "title": "Create product",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLiteProductForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLiteProductForm.submit"
                         }
@@ -78805,6 +78806,7 @@ const SCREENS = runtimeSetting({
                         "title": "Create post",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLitePostForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLitePostForm.submit"
                         }
@@ -79321,6 +79323,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "title": "Save changes",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLiteProductForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLiteProductForm.submit"
                         }
@@ -79683,6 +79686,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "title": "Save changes",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLiteEventForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLiteEventForm.submit"
                         }
@@ -80006,6 +80010,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "title": "Save changes",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLitePostForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLitePostForm.submit"
                         }

package/templates/community-club-owner/tier5-src/_shared/exclusive-writes.ts

@@ -0,0 +1,66 @@
+import { defineService as register, type ServiceDefinition } from '@himalaya/state';
+
+/** Reject repeated taps until the accepted write's result is committed. A promise
+ * queue alone releases before the host applies the reducer result, so the next
+ * write can still read an old revision/id. The private synchronous reducer below
+ * publishes busy and commits completion through the ordinary service handle;
+ * awaiting that handle guarantees the host has stored the result before unlock.
+ * Skipped actions return undefined, so they cannot roll back the accepted write.
+ */
+export function withExclusiveWrites<S extends object = Record<string, unknown>>(
+  registerService: typeof register, names: readonly string[],
+  options: { prepare?: (action: string, args: readonly unknown[]) => void; coalesce?: readonly string[]; settle?: (before: S, next: S, live: S) => S } = {},
+): typeof register {
+  return ((name: string, definition: ServiceDefinition<Record<string, unknown>>) => {
+    let busy = false;
+    let activeAction = "";
+    let completion = Promise.resolve();
+    let complete = () => {};
+    let handle: { getState(): Record<string, unknown>; exclusiveWriteState(next: Record<string, unknown>): Promise<unknown> };
+    const wrapped: ServiceDefinition<Record<string, unknown>> = {
+      ...definition,
+      state: { ...definition.state, writeBusy: false },
+      notHydrated: [...(definition.notHydrated ?? []), 'writeBusy'],
+      actions: {
+        ...Object.fromEntries(Object.entries(definition.actions ?? {}).map(([action, reduce]) => [action,
+          names.includes(action) ? async (state: Record<string, unknown>, ...args: never[]) => {
+            // Intake request metadata even when its state replacement is skipped.
+            options.prepare?.(action, args);
+            if (busy) {
+              // Repeated initial loads must await the accepted load, so callers
+              // observe its committed rows rather than the initial skeleton.
+              if (activeAction === action && options.coalesce?.includes(action)) await completion;
+              return;
+            }
+            busy = true;
+            activeAction = action;
+            completion = new Promise<void>(resolve => { complete = resolve; });
+            try {
+              await handle.exclusiveWriteState({ ...handle.getState(), writeBusy: true });
+              const next = await reduce(state, ...args);
+              const live = handle.getState();
+              // Non-write actions (for example editing a draft field) can still run
+              // during I/O. Let the owning service preserve those newer edits.
+              const settled = options.settle ? options.settle(state as S, (next ?? live) as S, live as S) : next ?? live;
+              await handle.exclusiveWriteState({ ...settled, writeBusy: false });
+            } catch (error) {
+              await handle.exclusiveWriteState({ ...handle.getState(), writeBusy: false });
+              throw error;
+            } finally {
+              busy = false;
+              complete();
+            }
+          } : reduce,
+        ])),
+        exclusiveWriteState: (_state, next: Record<string, unknown>) => next,
+      },
+    };
+    const registered = registerService(name, wrapped);
+    // Registration preserves this private action, but the dynamic action map
+    // cannot express its payload to the generic service handle.
+    handle = registered as unknown as typeof handle;
+    // Older hosts ignore notHydrated. A fresh worker has no pending write.
+    handle.getState().writeBusy = false;
+    return registered;
+  }) as typeof register;
+}

package/templates/community-club-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -6,7 +6,9 @@
 // form can't safely collect — so this form only edits an existing event's text
 // (title + description). Bound by buildForm ($service:himiOwnerLiteEventForm.*).
 
-import { defineService } from "@himalaya/state";
+import { defineService as registerService } from "@himalaya/state";
+import { withExclusiveWrites } from "../_shared/exclusive-writes.js";
+const defineService = withExclusiveWrites(registerService, ["submit"]);
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
@@ -66,6 +68,7 @@ interface EventFormState {
   when: string;
   location: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
+  writeBusy: boolean;
   error: string;
   savedMessage: string;
   /** WS-C — canonical detail target (`himi_owner_lite_event`); `savedId` rides
@@ -140,6 +143,7 @@ function shape(s: Partial<EventFormState>): EventFormState {
     when: s.when ?? "—",
     location: s.location ?? "—",
     status: s.status ?? "idle",
+    writeBusy: s.writeBusy ?? false,
     error: s.error ?? "",
     savedMessage: s.savedMessage ?? "",
     // WS-C — canonical detail target + the saved entity's id as a separate nav

package/templates/community-club-owner/tier5-src/himi-owner-lite-post-form/index.ts

@@ -8,7 +8,9 @@ import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetH
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { wixCall } from "@himalaya/wix-site-media";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
-import { defineService } from "@himalaya/state";
+import { defineService as registerService } from "@himalaya/state";
+import { withExclusiveWrites } from "../_shared/exclusive-writes.js";
+const defineService = withExclusiveWrites(registerService, ["submit"]);
 import { getDraftPost, createDraftPost, updateDraftPost, type WixDraftPostWrite, type WixRichContent } from "@himalaya/wix-blog";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
 import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
@@ -53,6 +55,7 @@ interface PostFormState {
   noCover: boolean;
   isFeatured: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
+  writeBusy: boolean;
   error: string;
   savedMessage: string;
   /** WS-C — canonical detail target (`himi_owner_lite_post`); `savedId` rides
@@ -128,6 +131,7 @@ function shape(s: Partial<PostFormState>): PostFormState {
     noCover: !s.coverUrl,
     isFeatured: s.isFeatured ?? "false",
     status: s.status ?? "idle",
+    writeBusy: s.writeBusy ?? false,
     error: s.error ?? "",
     savedMessage: s.savedMessage ?? "",
     // WS-C — canonical detail target + the saved entity's id as a separate nav

package/templates/community-club-owner/tier5-src/himi-owner-lite-product-form/index.ts

@@ -6,7 +6,9 @@
 // the WRITE shape needs `priceData: { price: <number>, currency }`. Bound by the
 // generic buildForm descriptor ($service:himiOwnerLiteProductForm.*).
 
-import { defineService } from "@himalaya/state";
+import { defineService as registerService } from "@himalaya/state";
+import { withExclusiveWrites } from "../_shared/exclusive-writes.js";
+const defineService = withExclusiveWrites(registerService, ["submit"]);
 import {
   getProduct,
   createProduct,
@@ -76,6 +78,7 @@ interface ProductFormState {
   descriptionNote: string;
   visible: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
+  writeBusy: boolean;
   error: string;
   savedMessage: string;
   /** WS-C — canonical detail target (`himi_owner_lite_product`); `savedId` rides
@@ -161,6 +164,7 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
     descriptionNote: dMode === "locked" ? copyParam("ownerProductForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; name, price and SKU can be changed here.") : "",
     visible: s.visible ?? "true",
     status: s.status ?? "idle",
+    writeBusy: s.writeBusy ?? false,
     error: s.error ?? "",
     savedMessage: s.savedMessage ?? "",
     // WS-C — canonical detail target + the saved entity's id as a separate nav

package/templates/events-meetups-owner/dev/index.ts

@@ -72672,6 +72672,7 @@ const SCREENS = runtimeSetting({
                         "title": "Create post",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLitePostForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLitePostForm.submit"
                         }
@@ -73146,6 +73147,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "title": "Save changes",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLiteEventForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLiteEventForm.submit"
                         }
@@ -73470,6 +73472,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "title": "Save changes",
                         "style": "primary",
                         "fullWidth": true,
+                        "disabledPath": "$service:himiOwnerLitePostForm.writeBusy",
                         "action": {
                           "actionId": "tier5.himiOwnerLitePostForm.submit"
                         }

package/templates/events-meetups-owner/tier5-src/_shared/exclusive-writes.ts

@@ -0,0 +1,66 @@
+import { defineService as register, type ServiceDefinition } from '@himalaya/state';
+
+/** Reject repeated taps until the accepted write's result is committed. A promise
+ * queue alone releases before the host applies the reducer result, so the next
+ * write can still read an old revision/id. The private synchronous reducer below
+ * publishes busy and commits completion through the ordinary service handle;
+ * awaiting that handle guarantees the host has stored the result before unlock.
+ * Skipped actions return undefined, so they cannot roll back the accepted write.
+ */
+export function withExclusiveWrites<S extends object = Record<string, unknown>>(
+  registerService: typeof register, names: readonly string[],
+  options: { prepare?: (action: string, args: readonly unknown[]) => void; coalesce?: readonly string[]; settle?: (before: S, next: S, live: S) => S } = {},
+): typeof register {
+  return ((name: string, definition: ServiceDefinition<Record<string, unknown>>) => {
+    let busy = false;
+    let activeAction = "";
+    let completion = Promise.resolve();
+    let complete = () => {};
+    let handle: { getState(): Record<string, unknown>; exclusiveWriteState(next: Record<string, unknown>): Promise<unknown> };
+    const wrapped: ServiceDefinition<Record<string, unknown>> = {
+      ...definition,
+      state: { ...definition.state, writeBusy: false },
+      notHydrated: [...(definition.notHydrated ?? []), 'writeBusy'],
+      actions: {
+        ...Object.fromEntries(Object.entries(definition.actions ?? {}).map(([action, reduce]) => [action,
+          names.includes(action) ? async (state: Record<string, unknown>, ...args: never[]) => {
+            // Intake request metadata even when its state replacement is skipped.
+            options.prepare?.(action, args);
+            if (busy) {
+              // Repeated initial loads must await the accepted load, so callers
+              // observe its committed rows rather than the initial skeleton.
+              if (activeAction === action && options.coalesce?.includes(action)) await completion;
+              return;
+            }
+            busy = true;
+            activeAction = action;
+            completion = new Promise<void>(resolve => { complete = resolve; });
+            try {
+              await handle.exclusiveWriteState({ ...handle.getState(), writeBusy: true });
+              const next = await reduce(state, ...args);
+              const live = handle.getState();
+              // Non-write actions (for example editing a draft field) can still run
+              // during I/O. Let the owning service preserve those newer edits.
+              const settled = options.settle ? options.settle(state as S, (next ?? live) as S, live as S) : next ?? live;
+              await handle.exclusiveWriteState({ ...settled, writeBusy: false });
+            } catch (error) {
+              await handle.exclusiveWriteState({ ...handle.getState(), writeBusy: false });
+              throw error;
+            } finally {
+              busy = false;
+              complete();
+            }
+          } : reduce,
+        ])),
+        exclusiveWriteState: (_state, next: Record<string, unknown>) => next,
+      },
+    };
+    const registered = registerService(name, wrapped);
+    // Registration preserves this private action, but the dynamic action map
+    // cannot express its payload to the generic service handle.
+    handle = registered as unknown as typeof handle;
+    // Older hosts ignore notHydrated. A fresh worker has no pending write.
+    handle.getState().writeBusy = false;
+    return registered;
+  }) as typeof register;
+}

package/templates/events-meetups-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -6,7 +6,9 @@
 // form can't safely collect — so this form only edits an existing event's text
 // (title + description). Bound by buildForm ($service:himiOwnerLiteEventForm.*).
 
-import { defineService } from "@himalaya/state";
+import { defineService as registerService } from "@himalaya/state";
+import { withExclusiveWrites } from "../_shared/exclusive-writes.js";
+const defineService = withExclusiveWrites(registerService, ["submit"]);
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
@@ -66,6 +68,7 @@ interface EventFormState {
   when: string;
   location: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
+  writeBusy: boolean;
   error: string;
   savedMessage: string;
   /** WS-C — canonical detail target (`himi_owner_lite_event`); `savedId` rides
@@ -140,6 +143,7 @@ function shape(s: Partial<EventFormState>): EventFormState {
     when: s.when ?? "—",
     location: s.location ?? "—",
     status: s.status ?? "idle",
+    writeBusy: s.writeBusy ?? false,
     error: s.error ?? "",
     savedMessage: s.savedMessage ?? "",
     // WS-C — canonical detail target + the saved entity's id as a separate nav

package/templates/events-meetups-owner/tier5-src/himi-owner-lite-post-form/index.ts

@@ -8,7 +8,9 @@ import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetH
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { wixCall } from "@himalaya/wix-site-media";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
-import { defineService } from "@himalaya/state";
+import { defineService as registerService } from "@himalaya/state";
+import { withExclusiveWrites } from "../_shared/exclusive-writes.js";
+const defineService = withExclusiveWrites(registerService, ["submit"]);
 import { getDraftPost, createDraftPost, updateDraftPost, type WixDraftPostWrite, type WixRichContent } from "@himalaya/wix-blog";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
 import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
@@ -53,6 +55,7 @@ interface PostFormState {
   noCover: boolean;
   isFeatured: string;
   status: "idle" | "loading" | "saving" | "saved" | "error";
+  writeBusy: boolean;
   error: string;
   savedMessage: string;
   /** WS-C — canonical detail target (`himi_owner_lite_post`); `savedId` rides
@@ -128,6 +131,7 @@ function shape(s: Partial<PostFormState>): PostFormState {
     noCover: !s.coverUrl,
     isFeatured: s.isFeatured ?? "false",
     status: s.status ?? "idle",
+    writeBusy: s.writeBusy ?? false,
     error: s.error ?? "",
     savedMessage: s.savedMessage ?? "",
     // WS-C — canonical detail target + the saved entity's id as a separate nav

package/templates/gym-fitness/dev/index.ts

@@ -15759,39 +15759,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.qty_minus",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "minus",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Decrease quantity",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.decrement",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "minus",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.decrement",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Decrease quantity",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light"
                                                       }
                                                     },
@@ -15814,39 +15803,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.qty_plus",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "plus",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Increase quantity",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.increment",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "plus",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.increment",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Increase quantity",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light"
                                                       }
                                                     },
@@ -15862,39 +15840,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.save_filled",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "heart_fill",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Remove from wishlist",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.save",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "heart_fill",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.save",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Remove from wishlist",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light",
                                                         "hiddenPath": "$item.notSaved"
                                                       }
@@ -15903,39 +15870,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.save",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "heart",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Add to wishlist",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.save",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "heart",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.save",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Add to wishlist",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light",
                                                         "hiddenPath": "$item.saved"
                                                       }
@@ -15944,39 +15900,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.remove",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "trash",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Remove from cart",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.remove",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "trash",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.remove",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Remove from cart",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light"
                                                       }
                                                     }
@@ -16225,7 +16170,7 @@ const SCREENS = runtimeSetting({
                           "action": {
                             "actionId": "tier5.himiStoreCart.applyPromo"
                           },
-                          "disabledPath": "$service:himiStoreCart.promoBusy"
+                          "disabledPath": "$service:himiStoreCart.writeBusy"
                         }
                       },
                       "modifiers": {
@@ -16282,7 +16227,8 @@ const SCREENS = runtimeSetting({
                                   "iconOnly": true,
                                   "leadingIcon": "close",
                                   "cornerRadius": 22,
-                                  "minHeight": 44
+                                  "minHeight": 44,
+                                  "disabledPath": "$service:himiStoreCart.writeBusy"
                                 }
                               },
                               "modifiers": {
@@ -16416,6 +16362,7 @@ const SCREENS = runtimeSetting({
                   "title": "Checkout",
                   "style": "primary",
                   "fullWidth": true,
+                  "disabledPath": "$service:himiStoreCart.writeBusy",
                   "action": {
                     "actionId": "tier5.himiStoreCart.checkout"
                   }