@wix/himalaya-cli 0.1494.0 → 0.1495.0

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

@@ -629,7 +629,7 @@ const SCREENS = runtimeSetting({
                                                                   "package": "himalaya",
                                                                   "type": "Text",
                                                                   "props": {
-                                                                    "text": "Products you saved",
+                                                                    "text": "Wishlist",
                                                                     "style": "bodyEmphasis"
                                                                   }
                                                                 }
@@ -7490,9 +7490,9 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Button",
                         "props": {
-                          "title": "Saved products",
+                          "title": "Wishlist",
                           "style": "plain",
-                          "leadingIcon": "bookmark",
+                          "leadingIcon": "heart",
                           "fullWidth": false,
                           "action": {
                             "actionId": "himi.open",
@@ -10043,54 +10043,213 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "Text",
                 "props": {
-                  "text": "Saved products",
+                  "text": "Wishlist",
                   "style": "title1"
                 }
               }
             },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "Saved on this device. Open a product for its latest price and availability.",
-                  "style": "footnote",
-                  "color": "textSecondary"
-                }
-              }
-            },
             {
               "id": "himi_saved_products.skeleton",
               "body": {
                 "package": "himalaya",
-                "type": "Skeleton",
+                "type": "Grid",
                 "props": {
-                  "height": 168,
-                  "cornerRadius": 8
+                  "columns": 2,
+                  "spacing": 14,
+                  "items": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 8,
+                          "children": [
+                            {
+                              "id": "himi_saved_products.skeleton_image",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 168,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 168,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_saved_products.skeleton_name",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 14,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 14,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_saved_products.skeleton_price",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 12,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 12,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 4,
+                        "padding": {
+                          "leading": 8,
+                          "trailing": 8,
+                          "top": 8,
+                          "bottom": 8
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 8,
+                          "children": [
+                            {
+                              "id": "himi_saved_products.skeleton_image",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 168,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 168,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_saved_products.skeleton_name",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 14,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 14,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_saved_products.skeleton_price",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 12,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 12,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 4,
+                        "padding": {
+                          "leading": 8,
+                          "trailing": 8,
+                          "top": 8,
+                          "bottom": 8
+                        }
+                      }
+                    }
+                  ]
                 }
               },
               "modifiers": {
-                "height": 168,
-                "background": {
-                  "token": "surfaceSecondary"
-                },
-                "cornerRadius": 8,
-                "accessibilityRole": "decorative",
                 "hiddenPath": "$service:himiStoreSaved.notLoading"
               }
             },
             {
-              "id": "",
+              "id": "himi_saved_products.error",
               "body": {
                 "package": "himalaya",
-                "type": "Text",
+                "type": "Banner",
                 "props": {
-                  "text": "$service:himiStoreSaved.error",
-                  "style": "footnote",
-                  "color": "danger",
-                  "collapseWhenEmpty": true
+                  "title": "$service:himiStoreSaved.error",
+                  "severity": "danger"
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreSaved.notErrored"
               }
             },
             {
@@ -10197,81 +10356,282 @@ const SCREENS = runtimeSetting({
               "id": "himi_saved_products.list",
               "body": {
                 "package": "himalaya",
-                "type": "LazyList",
+                "type": "Grid",
                 "props": {
-                  "spacing": 16,
+                  "columns": 2,
+                  "columnsMedium": 3,
+                  "columnsExpanded": 4,
+                  "spacing": 14,
                   "itemsPath": "$service:himiStoreSaved.rows",
                   "items": [
                     {
-                      "id": "",
+                      "id": "himi_saved_products.row",
                       "body": {
                         "package": "himalaya",
                         "type": "VStack",
                         "props": {
                           "spacing": 8,
+                          "alignment": "leading",
                           "children": [
                             {
-                              "id": "himi_saved_products.row",
+                              "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Image",
                                 "props": {
-                                  "spacing": 9,
-                                  "alignment": "leading",
+                                  "url": "$item.image",
+                                  "fillWidth": true,
+                                  "aspectRatio": 0.75,
+                                  "contentMode": "fill",
+                                  "shape": "rect",
+                                  "contentDescription": "$item.name"
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "aspectRatio": 0.75,
+                                "onTap": {
+                                  "actionId": "himi.open",
+                                  "params": {
+                                    "screenId": "himi_product",
+                                    "id": "$item.id"
+                                  }
+                                },
+                                "pressFeedback": "highlight",
+                                "haptic": "light",
+                                "hiddenPath": "$item.noImage"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "ZStack",
+                                "props": {
+                                  "alignment": "center",
                                   "children": [
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Image",
+                                        "type": "Icon",
                                         "props": {
-                                          "url": "$item.image",
-                                          "fillWidth": true,
-                                          "height": 168,
-                                          "contentMode": "fill",
-                                          "contentDescription": "$item.name"
+                                          "name": "photo",
+                                          "size": 24,
+                                          "tint": "textSecondary"
                                         }
                                       },
                                       "modifiers": {
-                                        "cornerRadius": 8,
-                                        "fillMaxWidth": true,
-                                        "hiddenPath": "$item.noImage"
+                                        "accessibilityRole": "decorative"
                                       }
-                                    },
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "aspectRatio": 0.75,
+                                "background": {
+                                  "token": "surfaceTertiary"
+                                },
+                                "onTap": {
+                                  "actionId": "himi.open",
+                                  "params": {
+                                    "screenId": "himi_product",
+                                    "id": "$item.id"
+                                  }
+                                },
+                                "accessibilityLabel": "$item.name",
+                                "hiddenPath": "$item.hasImage"
+                              }
+                            },
+                            {
+                              "id": "himi_saved_products.tags",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "children": [
                                     {
-                                      "id": "himi_saved_products.row.monogram",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "ZStack",
+                                        "type": "Text",
                                         "props": {
-                                          "alignment": "center",
+                                          "text": "On sale",
+                                          "style": "caption",
+                                          "color": "textPrimary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "background": {
+                                          "token": "surfaceTertiary"
+                                        },
+                                        "padding": {
+                                          "leading": 8,
+                                          "trailing": 8,
+                                          "top": 4,
+                                          "bottom": 4
+                                        },
+                                        "hiddenPath": "$item.notOnSale"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_saved_products.swatches",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 5,
                                           "children": [
                                             {
-                                              "id": "",
+                                              "id": "himi_saved_products.swatch_1",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Text",
                                                 "props": {
-                                                  "text": "$item.initial",
-                                                  "style": "display",
-                                                  "color": "textOnAccent",
-                                                  "maxLines": 1
+                                                  "text": "",
+                                                  "style": "caption"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "width": 10,
+                                                "height": 10,
+                                                "cornerRadius": 5,
+                                                "backgroundColorPath": "$item.swatch1",
+                                                "border": {
+                                                  "width": 1,
+                                                  "color": {
+                                                    "token": "border"
+                                                  }
+                                                },
+                                                "accessibilityHidden": true,
+                                                "hiddenPath": "$item.noSwatch1"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_saved_products.swatch_2",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "",
+                                                  "style": "caption"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "width": 10,
+                                                "height": 10,
+                                                "cornerRadius": 5,
+                                                "backgroundColorPath": "$item.swatch2",
+                                                "border": {
+                                                  "width": 1,
+                                                  "color": {
+                                                    "token": "border"
+                                                  }
+                                                },
+                                                "accessibilityHidden": true,
+                                                "hiddenPath": "$item.noSwatch2"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_saved_products.swatch_3",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "",
+                                                  "style": "caption"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "width": 10,
+                                                "height": 10,
+                                                "cornerRadius": 5,
+                                                "backgroundColorPath": "$item.swatch3",
+                                                "border": {
+                                                  "width": 1,
+                                                  "color": {
+                                                    "token": "border"
+                                                  }
+                                                },
+                                                "accessibilityHidden": true,
+                                                "hiddenPath": "$item.noSwatch3"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_saved_products.swatch_4",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "",
+                                                  "style": "caption"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "width": 10,
+                                                "height": 10,
+                                                "cornerRadius": 5,
+                                                "backgroundColorPath": "$item.swatch4",
+                                                "border": {
+                                                  "width": 1,
+                                                  "color": {
+                                                    "token": "border"
+                                                  }
+                                                },
+                                                "accessibilityHidden": true,
+                                                "hiddenPath": "$item.noSwatch4"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_saved_products.swatch_5",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "",
+                                                  "style": "caption"
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "width": 10,
+                                                "height": 10,
+                                                "cornerRadius": 5,
+                                                "backgroundColorPath": "$item.swatch5",
+                                                "border": {
+                                                  "width": 1,
+                                                  "color": {
+                                                    "token": "border"
+                                                  }
+                                                },
+                                                "accessibilityHidden": true,
+                                                "hiddenPath": "$item.noSwatch5"
                                               }
                                             }
                                           ]
                                         }
                                       },
                                       "modifiers": {
-                                        "fillMaxWidth": true,
-                                        "height": 168,
-                                        "background": {
-                                          "token": "accentPrimary"
-                                        },
-                                        "cornerRadius": 8,
-                                        "hiddenPath": "$item.hasImage"
+                                        "hiddenPath": "$item.noSwatches"
                                       }
-                                    },
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.noTagRow"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 6,
+                                  "children": [
                                     {
                                       "id": "",
                                       "body": {
@@ -10279,9 +10639,42 @@ const SCREENS = runtimeSetting({
                                         "type": "Text",
                                         "props": {
                                           "text": "$item.name",
-                                          "style": "bodyEmphasis",
+                                          "style": "footnoteRegular",
+                                          "color": "textPrimary",
                                           "maxLines": 2
                                         }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 6,
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$item.wasPrice",
+                                          "style": "caption",
+                                          "color": "textSecondary",
+                                          "maxLines": 1,
+                                          "decoration": "strikethrough"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$item.notOnSale"
                                       }
                                     },
                                     {
@@ -10291,70 +10684,100 @@ const SCREENS = runtimeSetting({
                                         "type": "Text",
                                         "props": {
                                           "text": "$item.price",
-                                          "style": "footnote",
-                                          "color": "accentPrimary",
-                                          "maxLines": 1,
-                                          "collapseWhenEmpty": true
+                                          "style": "caption",
+                                          "color": "danger",
+                                          "maxLines": 1
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$item.notOnSale"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$item.price",
+                                          "style": "caption",
+                                          "color": "textPrimary",
+                                          "maxLines": 1
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$item.wasPriceEmpty"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_saved_products.remove",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "ZStack",
+                                        "props": {
+                                          "alignment": "center",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "heart_fill",
+                                                  "size": 22,
+                                                  "tint": "accentPrimary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative"
+                                              }
+                                            }
+                                          ]
                                         }
+                                      },
+                                      "modifiers": {
+                                        "width": 44,
+                                        "height": 44,
+                                        "onTap": {
+                                          "actionId": "tier5.himiStoreSaved.remove",
+                                          "params": {
+                                            "id": "$item.id"
+                                          }
+                                        },
+                                        "accessibilityRole": "button",
+                                        "accessibilityLabel": "Remove from wishlist",
+                                        "haptic": "light"
                                       }
                                     }
                                   ]
                                 }
-                              },
-                              "modifiers": {
-                                "background": {
-                                  "token": "surfaceElevated"
-                                },
-                                "border": {
-                                  "width": 1,
-                                  "color": {
-                                    "token": "border"
-                                  }
-                                },
-                                "cornerRadius": 8,
-                                "padding": {
-                                  "leading": 12,
-                                  "trailing": 12,
-                                  "top": 12,
-                                  "bottom": 12
-                                },
-                                "onTap": {
-                                  "actionId": "himi.open",
-                                  "params": {
-                                    "screenId": "$item.detailScreenId",
-                                    "id": "$item.id"
-                                  }
-                                },
-                                "pressFeedback": "scale",
-                                "haptic": "light",
-                                "accessibilityLabel": "$item.name"
-                              }
-                            },
-                            {
-                              "id": "himi_saved_products.remove",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Remove",
-                                  "style": "secondary",
-                                  "action": {
-                                    "actionId": "tier5.himiStoreSaved.remove",
-                                    "params": {
-                                      "id": "$item.id"
-                                    }
-                                  }
-                                }
                               }
                             }
                           ]
                         }
-                      }
-                    }
-                  ],
-                  "onPullToRefresh": {
-                    "actionId": "tier5.himiStoreSaved.load"
-                  }
+                      },
+                      "modifiers": {
+                        "onTap": {
+                          "actionId": "himi.open",
+                          "params": {
+                            "screenId": "himi_product",
+                            "id": "$item.id"
+                          }
+                        },
+                        "pressFeedback": "highlight",
+                        "haptic": "light",
+                        "accessibilityLabel": "$item.name"
+                      }
+                    }
+                  ]
                 }
               },
               "modifiers": {
@@ -10362,27 +10785,59 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "",
+              "id": "himi_saved_products.empty",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 12,
+                  "spacing": 10,
                   "alignment": "center",
                   "children": [
                     {
                       "id": "",
                       "body": {
                         "package": "himalaya",
-                        "type": "Icon",
+                        "type": "ZStack",
                         "props": {
-                          "name": "bookmark",
-                          "size": 34,
-                          "tint": "textTertiary"
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "heart",
+                                  "size": 24,
+                                  "tint": "textSecondary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "accessibilityRole": "decorative"
+                        "width": 56,
+                        "height": 56,
+                        "background": {
+                          "token": "surfaceTertiary"
+                        },
+                        "cornerRadius": 28
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Your wishlist is empty",
+                          "style": "title3",
+                          "textAlign": "center"
+                        }
                       }
                     },
                     {
@@ -10392,14 +10847,14 @@ const SCREENS = runtimeSetting({
                         "type": "Text",
                         "props": {
                           "text": "$service:himiStoreSaved.emptyText",
-                          "style": "bodyEmphasis",
+                          "style": "footnote",
                           "color": "textSecondary",
-                          "collapseWhenEmpty": true
+                          "textAlign": "center"
                         }
                       }
                     },
                     {
-                      "id": "himi_saved_products.empty.cta",
+                      "id": "himi_saved_products.browse",
                       "body": {
                         "package": "himalaya",
                         "type": "Button",
@@ -10419,16 +10874,6 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
-                "padding": {
-                  "leading": 24,
-                  "trailing": 24,
-                  "top": 24,
-                  "bottom": 24
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
-                },
                 "hiddenPath": "$service:himiStoreSaved.noEmpty"
               }
             }
@@ -11424,20 +11869,8 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "Text",
                 "props": {
-                  "text": "Cart",
-                  "style": "title1"
-                }
-              }
-            },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "Review your items before you check out.",
-                  "style": "body",
-                  "color": "textSecondary"
+                  "text": "Shopping cart",
+                  "style": "pageTitle"
                 }
               }
             },
@@ -11450,6 +11883,20 @@ const SCREENS = runtimeSetting({
                   "spacing": 8,
                   "alignment": "leading",
                   "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "You are offline",
+                          "style": "bodyEmphasis"
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiStoreCart.noOfflineError"
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -11459,6 +11906,9 @@ const SCREENS = runtimeSetting({
                           "text": "Your cart could not be loaded.",
                           "style": "bodyEmphasis"
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiStoreCart.noServerError"
                       }
                     },
                     {
@@ -11511,123 +11961,149 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "",
+              "id": "himi_cart.list",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "Grid",
                 "props": {
-                  "spacing": 12,
-                  "children": [
+                  "columns": 1,
+                  "spacing": 0,
+                  "itemsPath": "$service:himiStoreCart.items",
+                  "items": [
                     {
-                      "id": "himi_cart.list",
+                      "id": "himi_cart.row",
                       "body": {
                         "package": "himalaya",
-                        "type": "Grid",
+                        "type": "VStack",
                         "props": {
-                          "columns": 1,
-                          "spacing": 10,
-                          "itemsPath": "$service:himiStoreCart.items",
-                          "items": [
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
                             {
-                              "id": "himi_cart.row",
+                              "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Divider",
+                                "props": {}
+                              }
+                            },
+                            {
+                              "id": "himi_cart.row_content",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
                                 "props": {
-                                  "spacing": 8,
-                                  "alignment": "leading",
+                                  "spacing": 12,
                                   "children": [
+                                    {
+                                      "id": "himi_cart.thumbnail",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Image",
+                                        "props": {
+                                          "url": "$item.image",
+                                          "width": 112,
+                                          "height": 144,
+                                          "contentMode": "fit",
+                                          "shape": "rect",
+                                          "contentDescription": "$item.name"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "onTap": {
+                                          "actionId": "himi.open",
+                                          "params": {
+                                            "screenId": "himi_product",
+                                            "id": "$item.catalogItemId"
+                                          }
+                                        },
+                                        "hiddenPath": "$item.noImage"
+                                      }
+                                    },
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "HStack",
+                                        "type": "ZStack",
                                         "props": {
-                                          "spacing": 10,
+                                          "alignment": "center",
                                           "children": [
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Image",
-                                                "props": {
-                                                  "url": "$item.image",
-                                                  "width": 62,
-                                                  "height": 62,
-                                                  "contentMode": "fill",
-                                                  "contentDescription": "$item.title"
-                                                }
-                                              },
-                                              "modifiers": {
-                                                "cornerRadius": 8,
-                                                "hiddenPath": "$item.noImage"
-                                              }
-                                            },
-                                            {
-                                              "id": "himi_cart.row_media.initial",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "ZStack",
+                                                "type": "Text",
                                                 "props": {
-                                                  "alignment": "center",
-                                                  "children": [
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.initial",
-                                                          "style": "title2",
-                                                          "color": "textOnAccent",
-                                                          "maxLines": 1,
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      }
-                                                    }
-                                                  ]
+                                                  "text": "$item.initial",
+                                                  "style": "title2",
+                                                  "color": "textOnAccent"
                                                 }
-                                              },
-                                              "modifiers": {
-                                                "width": 62,
-                                                "height": 62,
-                                                "background": {
-                                                  "token": "accentPrimary"
-                                                },
-                                                "cornerRadius": 16,
-                                                "hiddenPath": "$item.hasImage"
                                               }
-                                            },
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "width": 112,
+                                        "height": 144,
+                                        "background": {
+                                          "token": "accentPrimary"
+                                        },
+                                        "onTap": {
+                                          "actionId": "himi.open",
+                                          "params": {
+                                            "screenId": "himi_product",
+                                            "id": "$item.catalogItemId"
+                                          }
+                                        },
+                                        "accessibilityLabel": "$item.name",
+                                        "hiddenPath": "$item.hasImage"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_cart.details",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "VStack",
+                                        "props": {
+                                          "spacing": 4,
+                                          "alignment": "leading",
+                                          "children": [
                                             {
-                                              "id": "",
+                                              "id": "himi_cart.name_price",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "VStack",
+                                                "type": "HStack",
                                                 "props": {
-                                                  "spacing": 3,
-                                                  "alignment": "leading",
+                                                  "spacing": 6,
                                                   "children": [
                                                     {
-                                                      "id": "",
+                                                      "id": "himi_cart.product_title",
                                                       "body": {
                                                         "package": "himalaya",
                                                         "type": "Text",
                                                         "props": {
                                                           "text": "$item.name",
                                                           "style": "bodyEmphasis",
+                                                          "color": "textPrimary",
                                                           "maxLines": 2
                                                         }
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 1
                                                       }
                                                     },
                                                     {
-                                                      "id": "",
+                                                      "id": "himi_cart.product_price",
                                                       "body": {
                                                         "package": "himalaya",
                                                         "type": "Text",
                                                         "props": {
-                                                          "text": "$item.subtitle",
-                                                          "style": "footnote",
-                                                          "color": "textSecondary"
+                                                          "text": "$item.total",
+                                                          "style": "bodyEmphasis",
+                                                          "color": "textPrimary",
+                                                          "maxLines": 1,
+                                                          "collapseWhenEmpty": true
                                                         }
                                                       }
                                                     }
@@ -11639,8 +12115,14 @@ const SCREENS = runtimeSetting({
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Spacer",
-                                                "props": {}
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.option1",
+                                                  "style": "body",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 1,
+                                                  "collapseWhenEmpty": true
+                                                }
                                               }
                                             },
                                             {
@@ -11649,67 +12131,56 @@ const SCREENS = runtimeSetting({
                                                 "package": "himalaya",
                                                 "type": "Text",
                                                 "props": {
-                                                  "text": "$item.total",
-                                                  "style": "bodyEmphasis",
+                                                  "text": "$item.option2",
+                                                  "style": "body",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 1,
                                                   "collapseWhenEmpty": true
                                                 }
                                               }
-                                            }
-                                          ]
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "HStack",
-                                        "props": {
-                                          "spacing": 10,
-                                          "children": [
+                                            },
                                             {
-                                              "id": "himi_cart.qty_minus",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Button",
+                                                "type": "Text",
                                                 "props": {
-                                                  "title": "−",
-                                                  "style": "secondary",
-                                                  "action": {
-                                                    "actionId": "tier5.himiStoreCart.decrement",
-                                                    "params": {
-                                                      "id": "$item.id"
-                                                    }
-                                                  }
+                                                  "text": "$item.option3",
+                                                  "style": "body",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 1,
+                                                  "collapseWhenEmpty": true
                                                 }
                                               }
                                             },
                                             {
-                                              "id": "himi_cart.qty_value",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Text",
                                                 "props": {
-                                                  "text": "$item.quantityLabel",
-                                                  "style": "bodyEmphasis"
+                                                  "text": "$item.inStockMessage",
+                                                  "style": "body",
+                                                  "color": "success"
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "hiddenPath": "$item.noInStockMessage"
                                               }
                                             },
                                             {
-                                              "id": "himi_cart.qty_plus",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Button",
+                                                "type": "Text",
                                                 "props": {
-                                                  "title": "+",
-                                                  "style": "secondary",
-                                                  "action": {
-                                                    "actionId": "tier5.himiStoreCart.increment",
-                                                    "params": {
-                                                      "id": "$item.id"
-                                                    }
-                                                  }
+                                                  "text": "$item.stockMessage",
+                                                  "style": "body",
+                                                  "color": "danger"
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "hiddenPath": "$item.noStockMessage"
                                               }
                                             },
                                             {
@@ -11721,140 +12192,272 @@ const SCREENS = runtimeSetting({
                                               }
                                             },
                                             {
-                                              "id": "himi_cart.remove",
+                                              "id": "himi_cart.actions",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Button",
+                                                "type": "HStack",
                                                 "props": {
-                                                  "title": "Remove",
-                                                  "style": "secondary",
-                                                  "action": {
-                                                    "actionId": "tier5.himiStoreCart.remove",
-                                                    "params": {
-                                                      "id": "$item.id"
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "himi_cart.qty_minus",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "ZStack",
+                                                        "props": {
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Icon",
+                                                                "props": {
+                                                                  "name": "minus",
+                                                                  "size": 24,
+                                                                  "tint": "textPrimary"
+                                                                }
+                                                              },
+                                                              "modifiers": {
+                                                                "accessibilityRole": "decorative"
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "width": 44,
+                                                        "height": 44,
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiStoreCart.decrement",
+                                                          "params": {
+                                                            "id": "$item.id"
+                                                          }
+                                                        },
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityLabel": "Decrease quantity",
+                                                        "haptic": "light"
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_cart.qty_value",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.quantityLabel",
+                                                          "style": "body",
+                                                          "textAlign": "center"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "width": 32
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_cart.qty_plus",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "ZStack",
+                                                        "props": {
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Icon",
+                                                                "props": {
+                                                                  "name": "plus",
+                                                                  "size": 24,
+                                                                  "tint": "textPrimary"
+                                                                }
+                                                              },
+                                                              "modifiers": {
+                                                                "accessibilityRole": "decorative"
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "width": 44,
+                                                        "height": 44,
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiStoreCart.increment",
+                                                          "params": {
+                                                            "id": "$item.id"
+                                                          }
+                                                        },
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityLabel": "Increase quantity",
+                                                        "haptic": "light"
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_cart.save_filled",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "ZStack",
+                                                        "props": {
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Icon",
+                                                                "props": {
+                                                                  "name": "heart_fill",
+                                                                  "size": 24,
+                                                                  "tint": "textPrimary"
+                                                                }
+                                                              },
+                                                              "modifiers": {
+                                                                "accessibilityRole": "decorative"
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "width": 44,
+                                                        "height": 44,
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiStoreCart.save",
+                                                          "params": {
+                                                            "id": "$item.id"
+                                                          }
+                                                        },
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityLabel": "Remove from wishlist",
+                                                        "haptic": "light",
+                                                        "hiddenPath": "$item.notSaved"
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_cart.save",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "ZStack",
+                                                        "props": {
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Icon",
+                                                                "props": {
+                                                                  "name": "heart",
+                                                                  "size": 24,
+                                                                  "tint": "textPrimary"
+                                                                }
+                                                              },
+                                                              "modifiers": {
+                                                                "accessibilityRole": "decorative"
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "width": 44,
+                                                        "height": 44,
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiStoreCart.save",
+                                                          "params": {
+                                                            "id": "$item.id"
+                                                          }
+                                                        },
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityLabel": "Add to wishlist",
+                                                        "haptic": "light",
+                                                        "hiddenPath": "$item.saved"
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_cart.remove",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "ZStack",
+                                                        "props": {
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Icon",
+                                                                "props": {
+                                                                  "name": "trash",
+                                                                  "size": 24,
+                                                                  "tint": "textPrimary"
+                                                                }
+                                                              },
+                                                              "modifiers": {
+                                                                "accessibilityRole": "decorative"
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "width": 44,
+                                                        "height": 44,
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiStoreCart.remove",
+                                                          "params": {
+                                                            "id": "$item.id"
+                                                          }
+                                                        },
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityLabel": "Remove from cart",
+                                                        "haptic": "light"
+                                                      }
                                                     }
-                                                  }
+                                                  ]
                                                 }
                                               }
                                             }
                                           ]
                                         }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
-                                "background": {
-                                  "token": "surfaceElevated"
-                                },
-                                "border": {
-                                  "width": 1,
-                                  "color": {
-                                    "token": "border"
-                                  }
-                                },
-                                "cornerRadius": 4,
-                                "padding": {
-                                  "leading": 16,
-                                  "trailing": 16,
-                                  "top": 16,
-                                  "bottom": 16
-                                }
+                                "fillMaxWidth": true
                               }
-                            }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_cart.summary",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
-                        "props": {
-                          "spacing": 8,
-                          "alignment": "leading",
-                          "children": [
+                            },
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 8,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "Subtotal",
-                                          "style": "bodyEmphasis"
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiStoreCart.subtotal",
-                                          "style": "bodyEmphasis",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_cart.checkout",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Checkout in browser",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "tier5.himiStoreCart.checkout"
-                                  }
-                                }
+                                "type": "Divider",
+                                "props": {}
                               }
                             }
                           ]
                         }
                       },
                       "modifiers": {
-                        "background": {
-                          "token": "surfaceElevated"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 4,
                         "padding": {
-                          "leading": 16,
-                          "trailing": 16,
                           "top": 16,
                           "bottom": 16
-                        },
-                        "hiddenPath": "$service:himiStoreCart.noItems"
+                        }
                       }
                     }
                   ]
@@ -11868,13 +12471,14 @@ const SCREENS = runtimeSetting({
               "id": "himi_cart.hint",
               "body": {
                 "package": "himalaya",
-                "type": "Text",
+                "type": "Banner",
                 "props": {
-                  "text": "$service:himiStoreCart.checkoutHint",
-                  "style": "footnote",
-                  "color": "textSecondary",
-                  "collapseWhenEmpty": true
+                  "title": "$service:himiStoreCart.checkoutHint",
+                  "severity": "warning"
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreCart.noCheckoutHint"
               }
             },
             {
@@ -11883,8 +12487,8 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 8,
-                  "alignment": "leading",
+                  "spacing": 12,
+                  "alignment": "center",
                   "children": [
                     {
                       "id": "",
@@ -11908,12 +12512,24 @@ const SCREENS = runtimeSetting({
                         "type": "Text",
                         "props": {
                           "text": "$service:himiStoreCart.emptyText",
-                          "style": "bodyEmphasis",
-                          "color": "textSecondary",
+                          "style": "title3",
+                          "color": "textPrimary",
                           "collapseWhenEmpty": true
                         }
                       }
                     },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Your items will appear here when you add them.",
+                          "style": "footnote",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
                     {
                       "id": "himi_cart.browse",
                       "body": {
@@ -11935,24 +12551,23 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
-                "background": {
-                  "token": "surfaceElevated"
-                },
-                "border": {
-                  "width": 1,
-                  "color": {
-                    "token": "border"
-                  }
-                },
-                "cornerRadius": 4,
-                "padding": {
-                  "leading": 16,
-                  "trailing": 16,
-                  "top": 16,
-                  "bottom": 16
-                },
                 "hiddenPath": "$service:himiStoreCart.noEmpty"
               }
+            },
+            {
+              "id": "himi_cart.order_placed",
+              "body": {
+                "package": "himalaya",
+                "type": "Snackbar",
+                "props": {
+                  "message": "Order placed. Thanks!",
+                  "severity": "success",
+                  "durationMs": 3000
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreCart.noPaidToast"
+              }
             }
           ]
         }
@@ -11987,58 +12602,173 @@ const SCREENS = runtimeSetting({
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
-    }
-  },
-  "himi_orders": {
-    "screenId": "himi_orders",
-    "renderer": "sdui_intent",
-    "title": "",
-    "schemaVersion": 1,
-    "cacheControl": {
-      "maxAge": 0,
-      "staleWhileRevalidate": 0
     },
-    "payload": {
-      "id": "himi_orders.root",
+    "stickyFooter": {
+      "id": "himi_cart.footer",
       "body": {
         "package": "himalaya",
         "type": "VStack",
         "props": {
-          "spacing": 16,
+          "spacing": 10,
           "alignment": "leading",
           "children": [
             {
-              "id": "himi_orders.title",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "Text",
+                "type": "HStack",
                 "props": {
-                  "text": "My orders",
-                  "style": "title1"
+                  "spacing": 8,
+                  "children": [
+                    {
+                      "id": "himi_cart.promo",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "TextField",
+                        "props": {
+                          "placeholder": "Promo code",
+                          "valuePath": "$service:himiStoreCart.promoCode",
+                          "onChange": {
+                            "actionId": "tier5.himiStoreCart.setPromo"
+                          },
+                          "onSubmit": {
+                            "actionId": "tier5.himiStoreCart.applyPromo"
+                          },
+                          "autoCapitalization": "characters",
+                          "suggestions": "off",
+                          "submitLabel": "done",
+                          "clearButton": true,
+                          "maxLength": 100,
+                          "borderless": true
+                        }
+                      },
+                      "modifiers": {
+                        "weight": 1,
+                        "height": 36,
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "padding": {
+                          "leading": 12,
+                          "trailing": 12
+                        },
+                        "hiddenPath": "$service:himiStoreCart.hasCoupon"
+                      }
+                    },
+                    {
+                      "id": "himi_cart.apply_promo",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Apply",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiStoreCart.applyPromo"
+                          },
+                          "disabledPath": "$service:himiStoreCart.promoBusy"
+                        }
+                      },
+                      "modifiers": {
+                        "height": 44,
+                        "cornerRadius": 0,
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "textPrimary"
+                          }
+                        },
+                        "hiddenPath": "$service:himiStoreCart.hasCoupon"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 8,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiStoreCart.appliedLabel",
+                                  "style": "footnote",
+                                  "color": "textPrimary"
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Spacer",
+                                "props": {}
+                              }
+                            },
+                            {
+                              "id": "himi_cart.remove_promo",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Button",
+                                "props": {
+                                  "title": "Remove promo code",
+                                  "action": {
+                                    "actionId": "tier5.himiStoreCart.removePromo"
+                                  },
+                                  "style": "tertiary",
+                                  "iconOnly": true,
+                                  "leadingIcon": "close",
+                                  "cornerRadius": 22,
+                                  "minHeight": 44
+                                }
+                              },
+                              "modifiers": {
+                                "width": 44,
+                                "height": 44,
+                                "accessibilityLabel": "Remove promo code",
+                                "accessibilityRole": "button"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiStoreCart.noCoupon"
+                      }
+                    }
+                  ]
                 }
               }
             },
             {
-              "id": "",
+              "id": "himi_cart.promo_error",
               "body": {
                 "package": "himalaya",
                 "type": "Text",
                 "props": {
-                  "text": "$service:himiBrandedOrders.identityLine",
-                  "style": "caption",
-                  "color": "textSecondary",
-                  "collapseWhenEmpty": true
+                  "text": "$service:himiStoreCart.promoError",
+                  "style": "footnote",
+                  "color": "danger"
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreCart.noPromoError"
               }
             },
             {
-              "id": "himi_orders.loading",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "HStack",
                 "props": {
                   "spacing": 8,
-                  "alignment": "leading",
                   "children": [
                     {
                       "id": "",
@@ -12046,9 +12776,29 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Loading orders...",
+                          "text": "Discount",
                           "style": "body",
-                          "color": "textSecondary"
+                          "color": "textPrimary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiStoreCart.discount",
+                          "style": "body",
+                          "color": "success"
                         }
                       }
                     }
@@ -12056,27 +12806,177 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
-                "background": {
-                  "token": "surfaceElevated"
-                },
-                "border": {
-                  "width": 1,
-                  "color": {
-                    "token": "border"
-                  }
-                },
-                "cornerRadius": 4,
-                "padding": {
-                  "leading": 16,
-                  "trailing": 16,
-                  "top": 16,
-                  "bottom": 16
-                },
-                "hiddenPath": "$service:himiBrandedOrders.notLoading"
+                "hiddenPath": "$service:himiStoreCart.noDiscount"
               }
             },
             {
-              "id": "himi_orders.error",
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 8,
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiStoreCart.subtotalLabel",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiStoreCart.subtotal",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "id": "himi_cart.checkout",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "Checkout",
+                  "style": "primary",
+                  "fullWidth": true,
+                  "action": {
+                    "actionId": "tier5.himiStoreCart.checkout"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "border": {
+          "width": 1,
+          "color": {
+            "token": "border"
+          }
+        },
+        "padding": {
+          "leading": 20,
+          "trailing": 20,
+          "top": 12,
+          "bottom": 12
+        },
+        "hiddenPath": "$service:himiStoreCart.noItems"
+      }
+    }
+  },
+  "himi_orders": {
+    "screenId": "himi_orders",
+    "renderer": "sdui_intent",
+    "title": "",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "payload": {
+      "id": "himi_orders.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 16,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "himi_orders.title",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "My orders",
+                  "style": "title1"
+                }
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiBrandedOrders.identityLine",
+                  "style": "caption",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "himi_orders.loading",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Loading orders...",
+                          "style": "body",
+                          "color": "textSecondary"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 4,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "hiddenPath": "$service:himiBrandedOrders.notLoading"
+              }
+            },
+            {
+              "id": "himi_orders.error",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
@@ -31691,7 +32591,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
   { pattern: "^himi_product(?:[_/](.+))?$", display: "himi_product[_{id}]", liveSeed: {"path":"/stores/v3/products/query","body":{"query":{"cursorPaging":{"limit":50}}},"listKey":"products","prefix":"himi_product_"}, template: {
     "screenId": "himi_product___HIMI_ID__",
     "renderer": "sdui_intent",
-    "title": "Product",
+    "title": "",
     "schemaVersion": 1,
     "cacheControl": {
       "maxAge": 0,
@@ -31820,12 +32720,12 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "package": "himalaya",
                         "type": "Skeleton",
                         "props": {
-                          "height": 220,
+                          "height": 510,
                           "cornerRadius": 8
                         }
                       },
                       "modifiers": {
-                        "height": 220,
+                        "height": 510,
                         "background": {
                           "token": "surfaceSecondary"
                         },
@@ -31834,41 +32734,61 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                       }
                     },
                     {
-                      "id": "himi_product.skeleton_title",
+                      "id": "",
                       "body": {
                         "package": "himalaya",
-                        "type": "Skeleton",
+                        "type": "VStack",
                         "props": {
-                          "height": 28,
-                          "cornerRadius": 8
+                          "spacing": 12,
+                          "children": [
+                            {
+                              "id": "himi_product.skeleton_title",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 28,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 28,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_product.skeleton_body",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 72,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 72,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "height": 28,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "himi_product.skeleton_body",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 72,
-                          "cornerRadius": 8
+                        "padding": {
+                          "leading": 16,
+                          "trailing": 16,
+                          "top": 12,
+                          "bottom": 12
                         }
-                      },
-                      "modifiers": {
-                        "height": 72,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
                       }
                     }
                   ]
@@ -31888,73 +32808,555 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                   "alignment": "leading",
                   "children": [
                     {
-                      "id": "himi_product.summary",
+                      "id": "himi_product.gallery",
                       "body": {
                         "package": "himalaya",
-                        "type": "VStack",
+                        "type": "Carousel",
                         "props": {
-                          "spacing": 12,
-                          "alignment": "leading",
-                          "children": [
+                          "itemsPath": "$service:himiStoreProduct.gallery",
+                          "items": [
                             {
-                              "id": "himi_product.gallery",
+                              "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Carousel",
+                                "type": "Image",
                                 "props": {
-                                  "itemsPath": "$service:himiStoreProduct.gallery",
-                                  "items": [
+                                  "url": "$item.url",
+                                  "fillWidth": true,
+                                  "height": 510,
+                                  "contentMode": "fill",
+                                  "contentDescription": "$service:himiStoreProduct.name"
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiStoreProduct.noGallery"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Image",
+                        "props": {
+                          "url": "$service:himiStoreProduct.image",
+                          "fillWidth": true,
+                          "height": 510,
+                          "contentMode": "fill",
+                          "contentDescription": "$service:himiStoreProduct.name"
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiStoreProduct.noSingleImage"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiStoreProduct.initial",
+                                  "style": "display",
+                                  "color": "textOnAccent"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "height": 510,
+                        "background": {
+                          "token": "accentPrimary"
+                        },
+                        "hiddenPath": "$service:himiStoreProduct.hasImage"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 16,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "On sale",
+                                  "style": "caption",
+                                  "color": "danger"
+                                }
+                              },
+                              "modifiers": {
+                                "background": {
+                                  "token": "surfaceTertiary"
+                                },
+                                "cornerRadius": 4,
+                                "padding": {
+                                  "leading": 8,
+                                  "trailing": 8,
+                                  "top": 4,
+                                  "bottom": 4
+                                },
+                                "hiddenPath": "$service:himiStoreProduct.notOnSale"
+                              }
+                            },
+                            {
+                              "id": "himi_product.title",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiStoreProduct.name",
+                                  "style": "title3",
+                                  "color": "textPrimary",
+                                  "maxLines": 2,
+                                  "collapseWhenEmpty": true
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_product.price_row",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiStoreProduct.wasPrice",
+                                          "style": "title3",
+                                          "color": "textSecondary",
+                                          "collapseWhenEmpty": true,
+                                          "decoration": "strikethrough"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiStoreProduct.notOnSale"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_product.price_sale",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiStoreProduct.price",
+                                          "style": "title3",
+                                          "color": "danger",
+                                          "collapseWhenEmpty": true
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiStoreProduct.notOnSale"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_product.price",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiStoreProduct.price",
+                                          "style": "title3",
+                                          "color": "accentPrimary",
+                                          "collapseWhenEmpty": true
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiStoreProduct.wasPriceEmpty"
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_product.options_card",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 12,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "himi_product.opt1_row",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "VStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "alignment": "leading",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiStoreProduct.opt1Label",
+                                                  "style": "body",
+                                                  "collapseWhenEmpty": true
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_product.opt1",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Picker",
+                                                "props": {
+                                                  "options": [],
+                                                  "optionsPath": "$service:himiStoreProduct.opt1Chips",
+                                                  "selectedId": "$service:himiStoreProduct.opt1SelectedId",
+                                                  "placeholder": "$service:himiStoreProduct.opt1Placeholder",
+                                                  "presentation": "sheet",
+                                                  "field": {
+                                                    "minHeight": 48,
+                                                    "cornerRadius": 4,
+                                                    "borderColor": "textSecondary",
+                                                    "borderWidth": 1,
+                                                    "padding": 16,
+                                                    "chevronIcon": "chevron_down"
+                                                  },
+                                                  "onChange": {
+                                                    "actionId": "tier5.himiStoreProduct.selectOption",
+                                                    "params": {
+                                                      "group": "1"
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityLabel": "$service:himiStoreProduct.opt1Label",
+                                                "hiddenPath": "$service:himiStoreProduct.hasOpt1Error"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_product.opt1_error",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Picker",
+                                                "props": {
+                                                  "options": [],
+                                                  "optionsPath": "$service:himiStoreProduct.opt1Chips",
+                                                  "selectedId": "$service:himiStoreProduct.opt1SelectedId",
+                                                  "placeholder": "$service:himiStoreProduct.opt1Placeholder",
+                                                  "presentation": "sheet",
+                                                  "field": {
+                                                    "minHeight": 48,
+                                                    "cornerRadius": 4,
+                                                    "borderColor": "danger",
+                                                    "borderWidth": 1,
+                                                    "padding": 16,
+                                                    "chevronIcon": "chevron_down"
+                                                  },
+                                                  "onChange": {
+                                                    "actionId": "tier5.himiStoreProduct.selectOption",
+                                                    "params": {
+                                                      "group": "1"
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityLabel": "$service:himiStoreProduct.opt1Label",
+                                                "hiddenPath": "$service:himiStoreProduct.noOpt1Error"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiStoreProduct.opt1Error",
+                                                  "style": "footnote",
+                                                  "color": "danger"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "hiddenPath": "$service:himiStoreProduct.noOpt1Error"
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiStoreProduct.noOpt1"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_product.opt2_row",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "VStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "alignment": "leading",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiStoreProduct.opt2Label",
+                                                  "style": "body",
+                                                  "collapseWhenEmpty": true
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_product.opt2",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Picker",
+                                                "props": {
+                                                  "options": [],
+                                                  "optionsPath": "$service:himiStoreProduct.opt2Chips",
+                                                  "selectedId": "$service:himiStoreProduct.opt2SelectedId",
+                                                  "placeholder": "$service:himiStoreProduct.opt2Placeholder",
+                                                  "presentation": "sheet",
+                                                  "field": {
+                                                    "minHeight": 48,
+                                                    "cornerRadius": 4,
+                                                    "borderColor": "textSecondary",
+                                                    "borderWidth": 1,
+                                                    "padding": 16,
+                                                    "chevronIcon": "chevron_down"
+                                                  },
+                                                  "onChange": {
+                                                    "actionId": "tier5.himiStoreProduct.selectOption",
+                                                    "params": {
+                                                      "group": "2"
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityLabel": "$service:himiStoreProduct.opt2Label",
+                                                "hiddenPath": "$service:himiStoreProduct.hasOpt2Error"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_product.opt2_error",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Picker",
+                                                "props": {
+                                                  "options": [],
+                                                  "optionsPath": "$service:himiStoreProduct.opt2Chips",
+                                                  "selectedId": "$service:himiStoreProduct.opt2SelectedId",
+                                                  "placeholder": "$service:himiStoreProduct.opt2Placeholder",
+                                                  "presentation": "sheet",
+                                                  "field": {
+                                                    "minHeight": 48,
+                                                    "cornerRadius": 4,
+                                                    "borderColor": "danger",
+                                                    "borderWidth": 1,
+                                                    "padding": 16,
+                                                    "chevronIcon": "chevron_down"
+                                                  },
+                                                  "onChange": {
+                                                    "actionId": "tier5.himiStoreProduct.selectOption",
+                                                    "params": {
+                                                      "group": "2"
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityLabel": "$service:himiStoreProduct.opt2Label",
+                                                "hiddenPath": "$service:himiStoreProduct.noOpt2Error"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiStoreProduct.opt2Error",
+                                                  "style": "footnote",
+                                                  "color": "danger"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "hiddenPath": "$service:himiStoreProduct.noOpt2Error"
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiStoreProduct.noOpt2"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_product.opt3_row",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "VStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "alignment": "leading",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiStoreProduct.opt3Label",
+                                                  "style": "body",
+                                                  "collapseWhenEmpty": true
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_product.opt3",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Picker",
+                                                "props": {
+                                                  "options": [],
+                                                  "optionsPath": "$service:himiStoreProduct.opt3Chips",
+                                                  "selectedId": "$service:himiStoreProduct.opt3SelectedId",
+                                                  "placeholder": "$service:himiStoreProduct.opt3Placeholder",
+                                                  "presentation": "sheet",
+                                                  "field": {
+                                                    "minHeight": 48,
+                                                    "cornerRadius": 4,
+                                                    "borderColor": "textSecondary",
+                                                    "borderWidth": 1,
+                                                    "padding": 16,
+                                                    "chevronIcon": "chevron_down"
+                                                  },
+                                                  "onChange": {
+                                                    "actionId": "tier5.himiStoreProduct.selectOption",
+                                                    "params": {
+                                                      "group": "3"
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityLabel": "$service:himiStoreProduct.opt3Label",
+                                                "hiddenPath": "$service:himiStoreProduct.hasOpt3Error"
+                                              }
+                                            },
+                                            {
+                                              "id": "himi_product.opt3_error",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Picker",
+                                                "props": {
+                                                  "options": [],
+                                                  "optionsPath": "$service:himiStoreProduct.opt3Chips",
+                                                  "selectedId": "$service:himiStoreProduct.opt3SelectedId",
+                                                  "placeholder": "$service:himiStoreProduct.opt3Placeholder",
+                                                  "presentation": "sheet",
+                                                  "field": {
+                                                    "minHeight": 48,
+                                                    "cornerRadius": 4,
+                                                    "borderColor": "danger",
+                                                    "borderWidth": 1,
+                                                    "padding": 16,
+                                                    "chevronIcon": "chevron_down"
+                                                  },
+                                                  "onChange": {
+                                                    "actionId": "tier5.himiStoreProduct.selectOption",
+                                                    "params": {
+                                                      "group": "3"
+                                                    }
+                                                  }
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityLabel": "$service:himiStoreProduct.opt3Label",
+                                                "hiddenPath": "$service:himiStoreProduct.noOpt3Error"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiStoreProduct.opt3Error",
+                                                  "style": "footnote",
+                                                  "color": "danger"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "hiddenPath": "$service:himiStoreProduct.noOpt3Error"
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiStoreProduct.noOpt3"
+                                      }
+                                    },
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Image",
+                                        "type": "Text",
                                         "props": {
-                                          "url": "$item.url",
-                                          "fillWidth": true,
-                                          "height": 240,
-                                          "contentMode": "fill",
-                                          "contentDescription": "$service:himiStoreProduct.name"
+                                          "text": "This product has more options than this screen can show. Open it on the website to order.",
+                                          "style": "footnote",
+                                          "color": "textSecondary"
                                         }
                                       },
                                       "modifiers": {
-                                        "cornerRadius": 8,
-                                        "fillMaxWidth": true
+                                        "hiddenPath": "$service:himiStoreProduct.noOptionsOverflow"
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
-                                "hiddenPath": "$service:himiStoreProduct.noGallery"
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Image",
-                                "props": {
-                                  "url": "$service:himiStoreProduct.image",
-                                  "fillWidth": true,
-                                  "height": 240,
-                                  "contentMode": "fill",
-                                  "contentDescription": "$service:himiStoreProduct.name"
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "fillMaxWidth": true,
-                                "hiddenPath": "$service:himiStoreProduct.noSingleImage"
+                                "hiddenPath": "$service:himiStoreProduct.noOptions"
                               }
                             },
                             {
-                              "id": "",
+                              "id": "himi_product.qty_row",
                               "body": {
                                 "package": "himalaya",
-                                "type": "ZStack",
+                                "type": "HStack",
                                 "props": {
-                                  "alignment": "center",
+                                  "spacing": 12,
                                   "children": [
                                     {
                                       "id": "",
@@ -31962,49 +33364,41 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$service:himiStoreProduct.initial",
-                                          "style": "display",
-                                          "color": "textOnAccent"
+                                          "text": "Quantity",
+                                          "style": "body"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_product.qty",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Stepper",
+                                        "props": {
+                                          "value": 1,
+                                          "valuePath": "$service:himiStoreProduct.quantity",
+                                          "min": 1,
+                                          "max": 99,
+                                          "presentation": "plain",
+                                          "onChange": {
+                                            "actionId": "tier5.himiStoreProduct.setQuantity"
+                                          }
                                         }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityLabel": "Quantity"
                                       }
                                     }
                                   ]
                                 }
-                              },
-                              "modifiers": {
-                                "fillMaxWidth": true,
-                                "height": 220,
-                                "background": {
-                                  "token": "accentPrimary"
-                                },
-                                "cornerRadius": 8,
-                                "hiddenPath": "$service:himiStoreProduct.hasImage"
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "$service:himiStoreProduct.name",
-                                  "style": "title2",
-                                  "maxLines": 2,
-                                  "collapseWhenEmpty": true
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_product.price",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "$service:himiStoreProduct.price",
-                                  "style": "title1",
-                                  "color": "accentPrimary",
-                                  "collapseWhenEmpty": true
-                                }
                               }
                             },
                             {
@@ -32033,7 +33427,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                       "props": {
                                         "text": "$service:himiStoreProduct.description",
                                         "style": "body",
-                                        "color": "textSecondary",
+                                        "color": "textPrimary",
                                         "collapseWhenEmpty": true
                                       }
                                     }
@@ -32049,206 +33443,22 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 "props": {
                                   "text": "$service:himiStoreProduct.description",
                                   "style": "body",
-                                  "color": "textSecondary",
+                                  "color": "textPrimary",
                                   "collapseWhenEmpty": true
                                 }
                               },
                               "modifiers": {
                                 "hiddenPath": "$service:himiStoreProduct.hasDescriptionJson"
                               }
-                            }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "background": {
-                          "token": "surfaceElevated"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 8,
-                        "padding": {
-                          "leading": 14,
-                          "trailing": 14,
-                          "top": 14,
-                          "bottom": 14
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_product.options_card",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
-                        "props": {
-                          "spacing": 12,
-                          "alignment": "leading",
-                          "children": [
-                            {
-                              "id": "himi_product.opt1_row",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 8,
-                                  "alignment": "leading",
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiStoreProduct.opt1Label",
-                                          "style": "bodyEmphasis",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_product.opt1",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "FilterChips",
-                                        "props": {
-                                          "chips": [],
-                                          "optionsPath": "$service:himiStoreProduct.opt1Chips",
-                                          "selectedIds": [
-                                            "$service:himiStoreProduct.opt1Selected"
-                                          ],
-                                          "onChange": {
-                                            "actionId": "tier5.himiStoreProduct.selectOption",
-                                            "params": {
-                                              "group": "1"
-                                            }
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityLabel": "$service:himiStoreProduct.opt1Label"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiStoreProduct.noOpt1"
-                              }
-                            },
-                            {
-                              "id": "himi_product.opt2_row",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 8,
-                                  "alignment": "leading",
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiStoreProduct.opt2Label",
-                                          "style": "bodyEmphasis",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_product.opt2",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "FilterChips",
-                                        "props": {
-                                          "chips": [],
-                                          "optionsPath": "$service:himiStoreProduct.opt2Chips",
-                                          "selectedIds": [
-                                            "$service:himiStoreProduct.opt2Selected"
-                                          ],
-                                          "onChange": {
-                                            "actionId": "tier5.himiStoreProduct.selectOption",
-                                            "params": {
-                                              "group": "2"
-                                            }
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityLabel": "$service:himiStoreProduct.opt2Label"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiStoreProduct.noOpt2"
-                              }
-                            },
-                            {
-                              "id": "himi_product.opt3_row",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 8,
-                                  "alignment": "leading",
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiStoreProduct.opt3Label",
-                                          "style": "bodyEmphasis",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_product.opt3",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "FilterChips",
-                                        "props": {
-                                          "chips": [],
-                                          "optionsPath": "$service:himiStoreProduct.opt3Chips",
-                                          "selectedIds": [
-                                            "$service:himiStoreProduct.opt3Selected"
-                                          ],
-                                          "onChange": {
-                                            "actionId": "tier5.himiStoreProduct.selectOption",
-                                            "params": {
-                                              "group": "3"
-                                            }
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityLabel": "$service:himiStoreProduct.opt3Label"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiStoreProduct.noOpt3"
-                              }
                             },
                             {
-                              "id": "himi_product.options_hint",
+                              "id": "himi_product.sku",
                               "body": {
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "$service:himiStoreProduct.optionsHint",
-                                  "style": "footnote",
+                                  "text": "$service:himiStoreProduct.skuLabel",
+                                  "style": "caption",
                                   "color": "textSecondary",
                                   "collapseWhenEmpty": true
                                 }
@@ -32258,203 +33468,277 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "This product has more options than this screen can show. Open it on the website to order.",
-                                  "style": "footnote",
-                                  "color": "textSecondary"
-                                }
+                                "type": "Divider",
+                                "props": {}
                               },
                               "modifiers": {
-                                "hiddenPath": "$service:himiStoreProduct.noOptionsOverflow"
+                                "hiddenPath": "$service:himiStoreProduct.noSku"
                               }
-                            }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "background": {
-                          "token": "surfaceElevated"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 8,
-                        "padding": {
-                          "leading": 14,
-                          "trailing": 14,
-                          "top": 14,
-                          "bottom": 14
-                        },
-                        "hiddenPath": "$service:himiStoreProduct.noOptions"
-                      }
-                    },
-                    {
-                      "id": "himi_product.qty_card",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
-                        "props": {
-                          "spacing": 12,
-                          "alignment": "leading",
-                          "children": [
+                            },
                             {
-                              "id": "himi_product.qty_row",
+                              "id": "himi_product.return_policy",
                               "body": {
                                 "package": "himalaya",
-                                "type": "HStack",
+                                "type": "VStack",
                                 "props": {
-                                  "spacing": 12,
+                                  "spacing": 0,
+                                  "alignment": "leading",
                                   "children": [
                                     {
-                                      "id": "",
+                                      "id": "himi_product.return_policy.header",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "HStack",
                                         "props": {
-                                          "text": "Quantity",
-                                          "style": "bodyEmphasis"
+                                          "spacing": 12,
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "Return & refund policy",
+                                                  "style": "body",
+                                                  "maxLines": 2
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Spacer",
+                                                "props": {}
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "chevron_down",
+                                                  "size": 16,
+                                                  "tint": "textSecondary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative",
+                                                "hiddenPath": "$service:himiStoreProduct.returnPolicyExpanded"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "chevron_up",
+                                                  "size": 16,
+                                                  "tint": "textSecondary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative",
+                                                "hiddenPath": "$service:himiStoreProduct.returnPolicyCollapsed"
+                                              }
+                                            }
+                                          ]
                                         }
+                                      },
+                                      "modifiers": {
+                                        "fillMaxWidth": true,
+                                        "padding": {
+                                          "top": 18,
+                                          "bottom": 18
+                                        },
+                                        "onTap": {
+                                          "actionId": "tier5.himiStoreProduct.toggleReturnPolicy"
+                                        },
+                                        "pressFeedback": "highlight",
+                                        "accessibilityRole": "button",
+                                        "accessibilityLabel": "Return & refund policy"
                                       }
                                     },
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiStoreProduct.returnPolicyBody",
+                                          "style": "body",
+                                          "color": "textSecondary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "padding": {
+                                          "bottom": 18
+                                        },
+                                        "hiddenPath": "$service:himiStoreProduct.returnPolicyCollapsed"
                                       }
                                     },
                                     {
-                                      "id": "himi_product.qty",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Stepper",
-                                        "props": {
-                                          "value": 1,
-                                          "min": 1,
-                                          "max": 99,
-                                          "onChange": {
-                                            "actionId": "tier5.himiStoreProduct.setQuantity"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityLabel": "Quantity"
+                                        "type": "Divider",
+                                        "props": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_product.shipping_info",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 0,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "himi_product.shipping_info.header",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 12,
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "Shipping info",
+                                                  "style": "body",
+                                                  "maxLines": 2
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Spacer",
+                                                "props": {}
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "chevron_down",
+                                                  "size": 16,
+                                                  "tint": "textSecondary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative",
+                                                "hiddenPath": "$service:himiStoreProduct.shippingInfoExpanded"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "chevron_up",
+                                                  "size": 16,
+                                                  "tint": "textSecondary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative",
+                                                "hiddenPath": "$service:himiStoreProduct.shippingInfoCollapsed"
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "fillMaxWidth": true,
+                                        "padding": {
+                                          "top": 18,
+                                          "bottom": 18
+                                        },
+                                        "onTap": {
+                                          "actionId": "tier5.himiStoreProduct.toggleShippingInfo"
+                                        },
+                                        "pressFeedback": "highlight",
+                                        "accessibilityRole": "button",
+                                        "accessibilityLabel": "Shipping info"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiStoreProduct.shippingInfoBody",
+                                          "style": "body",
+                                          "color": "textSecondary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "padding": {
+                                          "bottom": 18
+                                        },
+                                        "hiddenPath": "$service:himiStoreProduct.shippingInfoCollapsed"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Divider",
+                                        "props": {}
                                       }
                                     }
                                   ]
                                 }
                               }
                             }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "background": {
-                          "token": "surfaceElevated"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 8,
-                        "padding": {
-                          "leading": 14,
-                          "trailing": 14,
-                          "top": 14,
-                          "bottom": 14
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_product.save",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "$service:himiStoreProduct.saveLabel",
-                          "style": "secondary",
-                          "fullWidth": true,
-                          "leadingIcon": "bookmark",
-                          "action": {
-                            "actionId": "tier5.himiStoreProduct.toggleSave"
-                          }
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_product.save_hint",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiStoreProduct.saveHint",
-                          "style": "footnote",
-                          "collapseWhenEmpty": true
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_product.saved_list",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "View saved products",
-                          "style": "secondary",
-                          "fullWidth": true,
-                          "action": {
-                            "actionId": "himi.open",
-                            "params": {
-                              "screenId": "himi_saved_products"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_product.share",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Share",
-                          "style": "secondary",
-                          "fullWidth": true,
-                          "leadingIcon": "share",
-                          "action": {
-                            "actionId": "tier5.himiStoreProduct.share"
-                          }
-                        }
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiStoreProduct.cartHint",
-                          "style": "footnote",
-                          "color": "textSecondary",
-                          "collapseWhenEmpty": true
+                          ]
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiStoreProduct.added"
+                        "padding": {
+                          "leading": 16,
+                          "trailing": 16,
+                          "top": 4,
+                          "bottom": 8
+                        }
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:himiStoreProduct.isLoading"
+                "hiddenPath": "$service:himiStoreProduct.hideProduct"
+              }
+            },
+            {
+              "id": "himi_product.share_hint",
+              "body": {
+                "package": "himalaya",
+                "type": "Snackbar",
+                "props": {
+                  "message": "Sharing is not available on this device.",
+                  "severity": "warning",
+                  "durationMs": 3000
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreProduct.noShareHint"
               }
             },
             {
@@ -32508,24 +33792,273 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               "screenId": "himi_shop"
                             }
                           }
-                        }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 24,
+                  "trailing": 24,
+                  "top": 24,
+                  "bottom": 24
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiStoreProduct.noEmpty"
+              }
+            },
+            {
+              "id": "himi_product.added_sheet",
+              "body": {
+                "package": "himalaya",
+                "type": "BottomSheet",
+                "props": {
+                  "presentedPath": "$service:himiStoreProduct.addedSheetPresented",
+                  "placement": "inline",
+                  "modal": false,
+                  "autoDismissMs": 4000,
+                  "detents": [
+                    0.5,
+                    0.9
+                  ],
+                  "label": "Item added to cart",
+                  "onDismiss": {
+                    "actionId": "tier5.himiStoreProduct.closeAddedSheet"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 16,
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "HStack",
+                              "props": {
+                                "spacing": 12,
+                                "children": [
+                                  {
+                                    "id": "himi_product.added_sheet_title",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "Item added to cart",
+                                        "style": "title3"
+                                      }
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Spacer",
+                                      "props": {}
+                                    }
+                                  },
+                                  {
+                                    "id": "himi_product.added_sheet_close",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Button",
+                                      "props": {
+                                        "title": "Close confirmation",
+                                        "action": {
+                                          "actionId": "tier5.himiStoreProduct.closeAddedSheet"
+                                        },
+                                        "style": "tertiary",
+                                        "iconOnly": true,
+                                        "leadingIcon": "close",
+                                        "cornerRadius": 22,
+                                        "minHeight": 44
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "width": 44,
+                                      "height": 44,
+                                      "accessibilityLabel": "Close confirmation",
+                                      "accessibilityRole": "button"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            "modifiers": {
+                              "background": {
+                                "token": "surfaceSecondary"
+                              },
+                              "padding": {
+                                "leading": 16,
+                                "trailing": 16,
+                                "top": 12,
+                                "bottom": 12
+                              }
+                            }
+                          },
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "HStack",
+                              "props": {
+                                "spacing": 12,
+                                "children": [
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Image",
+                                      "props": {
+                                        "url": "$service:himiStoreProduct.image",
+                                        "width": 88,
+                                        "height": 112,
+                                        "contentMode": "fill",
+                                        "shape": "rect",
+                                        "contentDescription": "$service:himiStoreProduct.name"
+                                      }
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "VStack",
+                                      "props": {
+                                        "spacing": 6,
+                                        "alignment": "leading",
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "$service:himiStoreProduct.name",
+                                                "style": "bodyEmphasis",
+                                                "maxLines": 2
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "$service:himiStoreProduct.price",
+                                                "style": "body"
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "$service:himiStoreProduct.optionsSummary",
+                                                "style": "footnote",
+                                                "color": "textSecondary",
+                                                "collapseWhenEmpty": true
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "$service:himiStoreProduct.quantityLabel",
+                                                "style": "footnote",
+                                                "color": "textSecondary"
+                                              }
+                                            },
+                                            "modifiers": {
+                                              "hiddenPath": "$service:himiStoreProduct.quantityIsOne"
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          },
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "HStack",
+                              "props": {
+                                "spacing": 10,
+                                "children": [
+                                  {
+                                    "id": "himi_product.view_cart",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Button",
+                                      "props": {
+                                        "title": "View cart",
+                                        "style": "secondary",
+                                        "fullWidth": true,
+                                        "action": {
+                                          "actionId": "himi.open",
+                                          "params": {
+                                            "screenId": "himi_cart"
+                                          }
+                                        }
+                                      }
+                                    }
+                                  },
+                                  {
+                                    "id": "himi_product.checkout",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Button",
+                                      "props": {
+                                        "title": "Checkout",
+                                        "style": "primary",
+                                        "fullWidth": true,
+                                        "action": {
+                                          "actionId": "himi.open",
+                                          "params": {
+                                            "screenId": "himi_cart"
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    "modifiers": {
+                      "padding": {
+                        "leading": 16,
+                        "trailing": 16,
+                        "top": 16,
+                        "bottom": 24
+                      },
+                      "background": {
+                        "token": "surfacePrimary"
                       }
                     }
-                  ]
+                  }
                 }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 24,
-                  "trailing": 24,
-                  "top": 24,
-                  "bottom": 24
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
-                },
-                "hiddenPath": "$service:himiStoreProduct.noEmpty"
               }
             }
           ]
@@ -32536,9 +34069,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 16,
-          "trailing": 16,
-          "top": 18,
+          "top": 0,
           "bottom": 24
         },
         "onAppear": {
@@ -32565,7 +34096,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "id": "__HIMI_ID__"
     },
     "stickyFooter": {
-      "id": "",
+      "id": "himi_product.stickyFooter",
       "body": {
         "package": "himalaya",
         "type": "VStack",
@@ -32573,183 +34104,200 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "spacing": 8,
           "children": [
             {
-              "id": "himi_product.add_to_cart",
-              "body": {
-                "package": "himalaya",
-                "type": "Button",
-                "props": {
-                  "title": "Add to cart",
-                  "style": "primary",
-                  "fullWidth": true,
-                  "action": {
-                    "actionId": "tier5.himiStoreProduct.addToCart"
-                  },
-                  "disabledPath": "$service:himiStoreProduct.optionsIncomplete"
-                }
-              },
-              "modifiers": {
-                "cornerRadius": 8,
-                "pressFeedback": "scale",
-                "haptic": "medium",
-                "hiddenPath": "$service:himiStoreProduct.cartHidden"
-              }
-            },
-            {
-              "id": "himi_product.buy",
+              "id": "himi_product.save_hint",
               "body": {
                 "package": "himalaya",
-                "type": "Button",
+                "type": "Banner",
                 "props": {
-                  "title": "$service:himiStoreProduct.buyLabel",
-                  "style": "primary",
-                  "fullWidth": true,
-                  "disabledPath": "$service:himiStoreProduct.buyDisabled",
-                  "action": {
-                    "actionId": "tier5.himiStoreProduct.buy"
-                  }
+                  "title": "$service:himiStoreProduct.saveHint",
+                  "severity": "warning"
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:himiStoreProduct.buyHidden"
+                "hiddenPath": "$service:himiStoreProduct.noSaveHint"
               }
             },
             {
-              "id": "himi_product.buy_note",
+              "id": "himi_product.cart_hint",
               "body": {
                 "package": "himalaya",
-                "type": "Text",
+                "type": "Banner",
                 "props": {
-                  "text": "$service:himiStoreProduct.buyNote",
-                  "style": "footnote",
-                  "color": "textSecondary",
-                  "collapseWhenEmpty": true
+                  "title": "$service:himiStoreProduct.cartHint",
+                  "severity": "warning"
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:himiStoreProduct.buyHidden"
+                "hiddenPath": "$service:himiStoreProduct.noCartHint"
               }
             },
             {
-              "id": "himi_product.purchased",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "$service:himiStoreProduct.purchasedNote",
-                  "style": "footnote",
-                  "collapseWhenEmpty": true
-                }
-              }
-            },
-            {
-              "id": "himi_product.adding",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "HStack",
-                "props": {
-                  "spacing": 8,
-                  "children": [
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "ActivityIndicator",
-                        "props": {
-                          "indeterminate": true,
-                          "size": 16
-                        }
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Adding to cart…",
-                          "style": "footnote",
-                          "color": "textSecondary"
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              "modifiers": {
-                "hiddenPath": "$service:himiStoreProduct.notAdding"
+                "type": "Divider",
+                "props": {}
               }
             },
             {
-              "id": "himi_product.added_confirmation",
+              "id": "",
               "body": {
                 "package": "himalaya",
                 "type": "HStack",
                 "props": {
-                  "spacing": 10,
+                  "spacing": 12,
                   "children": [
                     {
-                      "id": "",
+                      "id": "himi_product.save",
                       "body": {
                         "package": "himalaya",
-                        "type": "Icon",
+                        "type": "ZStack",
                         "props": {
-                          "name": "check",
-                          "size": 18,
-                          "tint": "success"
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "$service:himiStoreProduct.saveIcon",
+                                  "size": 22,
+                                  "tint": "textPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "accessibilityRole": "decorative"
+                        "width": 48,
+                        "height": 48,
+                        "cornerRadius": 24,
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "onTap": {
+                          "actionId": "tier5.himiStoreProduct.toggleSave"
+                        },
+                        "accessibilityRole": "button",
+                        "accessibilityLabel": "$service:himiStoreProduct.saveLabel",
+                        "haptic": "light"
                       }
                     },
                     {
-                      "id": "",
+                      "id": "himi_product.add_to_cart",
                       "body": {
                         "package": "himalaya",
-                        "type": "Text",
+                        "type": "Button",
                         "props": {
-                          "text": "$service:himiStoreProduct.cartHint",
-                          "style": "footnote",
-                          "collapseWhenEmpty": true
+                          "title": "Add to cart",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiStoreProduct.addToCart"
+                          },
+                          "disabledPath": "$service:himiStoreProduct.addDisabled"
                         }
                       },
                       "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiStoreProduct.cartHidden",
                         "weight": 1
                       }
                     },
                     {
-                      "id": "himi_product.view_cart",
+                      "id": "himi_product.adding",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
+                        "type": "ZStack",
                         "props": {
-                          "title": "View cart",
-                          "style": "tertiary",
-                          "action": {
-                            "actionId": "himi.open",
-                            "params": {
-                              "screenId": "himi_cart"
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "ActivityIndicator",
+                                "props": {
+                                  "indeterminate": true,
+                                  "size": 18,
+                                  "tint": "textOnAccent"
+                                }
+                              }
                             }
-                          }
+                          ]
                         }
+                      },
+                      "modifiers": {
+                        "weight": 1,
+                        "height": 48,
+                        "background": {
+                          "token": "accentPrimary"
+                        },
+                        "cornerRadius": 8,
+                        "accessibilityLabel": "Adding to cart…",
+                        "hiddenPath": "$service:himiStoreProduct.notAdding"
                       }
                     }
                   ]
                 }
+              }
+            },
+            {
+              "id": "himi_product.buy",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "$service:himiStoreProduct.buyLabel",
+                  "style": "primary",
+                  "fullWidth": true,
+                  "disabledPath": "$service:himiStoreProduct.buyDisabled",
+                  "action": {
+                    "actionId": "tier5.himiStoreProduct.buy"
+                  }
+                }
               },
               "modifiers": {
-                "background": {
-                  "token": "surfaceSecondary"
-                },
-                "cornerRadius": 8,
-                "padding": {
-                  "leading": 12,
-                  "trailing": 8,
-                  "top": 6,
-                  "bottom": 6
-                },
-                "fillMaxWidth": true,
-                "hiddenPath": "$service:himiStoreProduct.notAdded"
+                "hiddenPath": "$service:himiStoreProduct.buyHidden"
+              }
+            },
+            {
+              "id": "himi_product.buy_note",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiStoreProduct.buyNote",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiStoreProduct.buyHidden"
+              }
+            },
+            {
+              "id": "himi_product.purchased",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiStoreProduct.purchasedNote",
+                  "style": "footnote",
+                  "collapseWhenEmpty": true
+                }
               }
             }
           ]
@@ -32765,11 +34313,19 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "top": 8,
           "bottom": 8
         },
-        "hiddenPath": "$service:himiStoreProduct.isLoading"
+        "hiddenPath": "$service:himiStoreProduct.hideBar"
       }
     },
     "topBar": {
       "actions": [
+        {
+          "id": "share",
+          "icon": "share",
+          "accessibilityLabel": "Share",
+          "onTap": {
+            "actionId": "tier5.himiStoreProduct.share"
+          }
+        },
         {
           "id": "cart",
           "icon": "cart",