@wix/himalaya-cli 0.1581.0 → 0.1583.0

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

@@ -19936,115 +19936,6 @@ const SCREENS = runtimeSetting({
           "spacing": 0,
           "alignment": "leading",
           "children": [
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "VStack",
-                "props": {
-                  "spacing": 4,
-                  "alignment": "leading",
-                  "children": [
-                    {
-                      "id": "himi_services.title",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Services",
-                          "style": "title1"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_services.subtitle",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Find a class and book your spot.",
-                          "style": "body",
-                          "color": "textSecondary"
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 0,
-                  "bottom": 0
-                }
-              }
-            },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "VStack",
-                "props": {
-                  "spacing": 0,
-                  "alignment": "leading",
-                  "children": [
-                    {
-                      "id": "himi_services.search",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "SearchField",
-                        "props": {
-                          "placeholder": "Search services",
-                          "value": "$service:himiBookingServices.collection.query",
-                          "debounceMs": 200,
-                          "onChange": {
-                            "actionId": "tier5.himiBookingServices.search"
-                          }
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 16,
-                  "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.collection.hideChrome"
-              }
-            },
-            {
-              "id": "himi_services.categories",
-              "body": {
-                "package": "himalaya",
-                "type": "FilterChips",
-                "props": {
-                  "chips": [],
-                  "optionsPath": "$service:himiBookingServices.categoryChips",
-                  "selectedIds": [
-                    "$service:himiBookingServices.collection.filter"
-                  ],
-                  "multiSelect": false,
-                  "onChange": {
-                    "actionId": "tier5.himiBookingServices.collectionFilter"
-                  }
-                }
-              },
-              "modifiers": {
-                "accessibilityLabel": "$service:himiBookingServices.categoriesLabel",
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 12,
-                  "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.hideCategories"
-              }
-            },
             {
               "id": "himi_services.offline",
               "body": {
@@ -20197,6 +20088,48 @@ const SCREENS = runtimeSetting({
                   "spacing": 0,
                   "alignment": "leading",
                   "children": [
+                    {
+                      "id": "himi_services.skeleton_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "width": 120,
+                                  "height": 20,
+                                  "cornerRadius": 4
+                                }
+                              },
+                              "modifiers": {
+                                "width": 120,
+                                "height": 20,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 4,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 20,
+                          "bottom": 4
+                        }
+                      }
+                    },
                     {
                       "id": "himi_services.skeleton_1",
                       "body": {
@@ -20908,7 +20841,7 @@ const SCREENS = runtimeSetting({
                 "padding": {
                   "leading": 0,
                   "trailing": 0,
-                  "top": 12,
+                  "top": 0,
                   "bottom": 0
                 },
                 "hiddenPath": "$service:himiBookingServices.collection.noLoading"
@@ -20921,7 +20854,7 @@ const SCREENS = runtimeSetting({
                 "type": "LazyList",
                 "props": {
                   "spacing": 0,
-                  "itemsPath": "$service:himiBookingServices.collection.items",
+                  "itemsPath": "$service:himiBookingServices.listRows",
                   "onPullToRefresh": {
                     "actionId": "tier5.himiBookingServices.refresh"
                   },
@@ -20930,13 +20863,17 @@ const SCREENS = runtimeSetting({
                     "onLoadMore": {
                       "actionId": "tier5.himiBookingServices.loadMore"
                     },
-                    "pageSize": 50
+                    "pageSize": 100
                   },
                   "staggerMs": 30,
                   "animateItems": true,
+                  "scrollToItemPath": "$service:himiBookingServices.scrollTo",
+                  "onTopItemChange": {
+                    "actionId": "tier5.himiBookingServices.topItemChanged"
+                  },
                   "items": [
                     {
-                      "id": "himi_services.row.$item.id",
+                      "id": "himi_services.item.$item.id",
                       "body": {
                         "package": "himalaya",
                         "type": "VStack",
@@ -20945,47 +20882,75 @@ const SCREENS = runtimeSetting({
                           "alignment": "leading",
                           "children": [
                             {
-                              "id": "",
+                              "id": "himi_services.section.$item.id",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
                                 "props": {
-                                  "spacing": 14,
+                                  "spacing": 0,
                                   "alignment": "center",
                                   "children": [
                                     {
-                                      "id": "himi_services.row.$item.id/image",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Image",
+                                        "type": "Text",
                                         "props": {
-                                          "url": "$item.image",
-                                          "width": 72,
-                                          "height": 72,
-                                          "contentMode": "fill"
+                                          "text": "$item.sectionTitle",
+                                          "style": "title3",
+                                          "maxLines": 2
                                         }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityRole": "decorative",
-                                        "cornerRadius": 8,
-                                        "hiddenPath": "$item.noImage"
                                       }
                                     },
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "ZStack",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "padding": {
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 20,
+                                  "bottom": 4
+                                },
+                                "accessibilityRole": "heading",
+                                "accessibilityLabel": "$item.sectionTitle",
+                                "hiddenPath": "$item.notSection"
+                              }
+                            },
+                            {
+                              "id": "himi_services.row.$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 0,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
                                         "props": {
+                                          "spacing": 14,
                                           "alignment": "center",
                                           "children": [
                                             {
-                                              "id": "",
+                                              "id": "himi_services.row.$item.id/image",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Image",
                                                 "props": {
-                                                  "url": "",
+                                                  "url": "$item.image",
                                                   "width": 72,
                                                   "height": 72,
                                                   "contentMode": "fill"
@@ -20994,292 +20959,750 @@ const SCREENS = runtimeSetting({
                                               "modifiers": {
                                                 "accessibilityRole": "decorative",
                                                 "cornerRadius": 8,
-                                                "background": {
-                                                  "token": "surfaceSecondary"
-                                                }
+                                                "hiddenPath": "$item.noImage"
                                               }
                                             },
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Icon",
+                                                "type": "ZStack",
                                                 "props": {
-                                                  "name": "image",
-                                                  "size": 24,
-                                                  "tint": "accentPrimary"
+                                                  "alignment": "center",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Image",
+                                                        "props": {
+                                                          "url": "",
+                                                          "width": 72,
+                                                          "height": 72,
+                                                          "contentMode": "fill"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative",
+                                                        "cornerRadius": 8,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Icon",
+                                                        "props": {
+                                                          "name": "image",
+                                                          "size": 24,
+                                                          "tint": "accentPrimary"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative"
+                                                      }
+                                                    }
+                                                  ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "accessibilityRole": "decorative"
+                                                "width": 72,
+                                                "height": 72,
+                                                "hiddenPath": "$item.hasImage"
                                               }
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "width": 72,
-                                        "height": 72,
-                                        "hiddenPath": "$item.hasImage"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "VStack",
-                                        "props": {
-                                          "spacing": 3,
-                                          "alignment": "leading",
-                                          "children": [
+                                            },
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Text",
+                                                "type": "VStack",
                                                 "props": {
-                                                  "text": "$item.typeTag",
-                                                  "style": "caption",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 1
+                                                  "spacing": 3,
+                                                  "alignment": "leading",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.typeTag",
+                                                          "style": "caption",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 1
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "background": {
+                                                          "token": "surfaceTertiary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "padding": {
+                                                          "leading": 8,
+                                                          "trailing": 8,
+                                                          "top": 2,
+                                                          "bottom": 2
+                                                        },
+                                                        "hiddenPath": "$item.noTypeTag"
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_services.row.$item.id/ended",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.endedText",
+                                                          "style": "caption",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 1,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.name",
+                                                          "style": "bodyEmphasis",
+                                                          "maxLines": 2
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.tagline",
+                                                          "style": "caption",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 2,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.meta",
+                                                          "style": "footnote",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 2,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "background": {
-                                                  "token": "surfaceTertiary"
-                                                },
-                                                "cornerRadius": 4,
-                                                "padding": {
-                                                  "leading": 8,
-                                                  "trailing": 8,
-                                                  "top": 2,
-                                                  "bottom": 2
-                                                },
-                                                "hiddenPath": "$item.noTypeTag"
-                                              }
-                                            },
-                                            {
-                                              "id": "himi_services.row.$item.id/ended",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.endedText",
-                                                  "style": "caption",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 1,
-                                                  "collapseWhenEmpty": true
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.name",
-                                                  "style": "bodyEmphasis",
-                                                  "maxLines": 2
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.tagline",
-                                                  "style": "caption",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 2,
-                                                  "collapseWhenEmpty": true
-                                                }
+                                                "weight": 1
                                               }
                                             },
                                             {
-                                              "id": "",
+                                              "id": "himi_services.row.$item.id/book",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Text",
+                                                "type": "VStack",
                                                 "props": {
-                                                  "text": "$item.meta",
-                                                  "style": "footnote",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 2,
-                                                  "collapseWhenEmpty": true
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "HStack",
+                                                        "props": {
+                                                          "spacing": 0,
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Text",
+                                                                "props": {
+                                                                  "text": "$item.bookCta",
+                                                                  "style": "footnote",
+                                                                  "color": "textPrimary",
+                                                                  "maxLines": 1
+                                                                }
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 36,
+                                                        "padding": {
+                                                          "leading": 16,
+                                                          "trailing": 16,
+                                                          "top": 0,
+                                                          "bottom": 0
+                                                        },
+                                                        "cornerRadius": 18,
+                                                        "border": {
+                                                          "width": 1,
+                                                          "color": {
+                                                            "token": "textPrimary"
+                                                          }
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "padding": {
+                                                  "leading": 0,
+                                                  "trailing": 0,
+                                                  "top": 4,
+                                                  "bottom": 4
+                                                },
+                                                "onTap": {
+                                                  "actionId": "himi.open",
+                                                  "params": {
+                                                    "screenId": "himi_time",
+                                                    "id": "$item.id"
+                                                  }
+                                                },
+                                                "accessibilityRole": "button",
+                                                "accessibilityLabel": "$item.bookA11y",
+                                                "pressFeedback": "scale",
+                                                "haptic": "light",
+                                                "hiddenPath": "$item.noBook"
                                               }
                                             }
                                           ]
                                         }
                                       },
                                       "modifiers": {
-                                        "weight": 1
+                                        "fillMaxWidth": true,
+                                        "padding": {
+                                          "leading": 20,
+                                          "trailing": 20,
+                                          "top": 14,
+                                          "bottom": 14
+                                        }
                                       }
                                     },
                                     {
-                                      "id": "himi_services.row.$item.id/book",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "VStack",
-                                        "props": {
-                                          "spacing": 0,
-                                          "children": [
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "HStack",
-                                                "props": {
-                                                  "spacing": 0,
-                                                  "alignment": "center",
-                                                  "children": [
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.bookCta",
-                                                          "style": "footnote",
-                                                          "color": "textPrimary",
-                                                          "maxLines": 1
-                                                        }
+                                        "type": "Divider",
+                                        "props": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "onTap": {
+                                  "actionId": "himi.open",
+                                  "params": {
+                                    "screenId": "$item.detailScreenId",
+                                    "id": "$item.id"
+                                  }
+                                },
+                                "pressFeedback": "highlight",
+                                "haptic": "light",
+                                "accessibilityLabel": "$item.a11y",
+                                "hiddenPath": "$item.isSection"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "transition": {
+                          "enter": "fadeSlide",
+                          "direction": "up",
+                          "distance": 8
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 0,
+                  "trailing": 0,
+                  "top": 0,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.hideRows"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "More services did not load.",
+                          "style": "caption",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_services.retry_page",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.retry"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 12,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noPageError"
+              }
+            },
+            {
+              "id": "himi_services.empty_source",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 10,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "calendar",
+                          "size": 28,
+                          "tint": "textTertiary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBookingServices.collection.emptySourceText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "textAlign": "center"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noEmptySource"
+              }
+            },
+            {
+              "id": "himi_services.empty",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 16,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "himi_services.no_match_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBookingServices.noMatchText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "textAlign": "center"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_services.empty.cta",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Clear Search",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.search",
+                            "params": {
+                              "value": ""
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingServices.noQuery"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noEmpty"
+              }
+            },
+            {
+              "id": "himi_services.location_empty",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 16,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "himi_services.location_empty_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBookingServices.locationEmptyText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "textAlign": "center"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_services.all_locations",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Show all locations",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.selectLocation",
+                            "params": {
+                              "locationId": ""
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingServices.notLocationEmpty"
+              }
+            },
+            {
+              "id": "himi_services.location_sheet",
+              "body": {
+                "package": "himalaya",
+                "type": "BottomSheet",
+                "props": {
+                  "presentedPath": "$service:himiBookingServices.locationSheetOpen",
+                  "dismissible": true,
+                  "showGrabber": true,
+                  "onDismiss": {
+                    "actionId": "tier5.himiBookingServices.closeLocations"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 8,
+                        "alignment": "leading",
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "Choose a location",
+                                "style": "title3"
+                              }
+                            }
+                          },
+                          {
+                            "id": "himi_services.location_options",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Grid",
+                              "props": {
+                                "columns": 1,
+                                "spacing": 0,
+                                "itemsPath": "$service:himiBookingServices.locationOptions",
+                                "items": [
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "VStack",
+                                      "props": {
+                                        "spacing": 0,
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "HStack",
+                                              "props": {
+                                                "spacing": 12,
+                                                "alignment": "center",
+                                                "children": [
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "VStack",
+                                                      "props": {
+                                                        "spacing": 2,
+                                                        "alignment": "leading",
+                                                        "children": [
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.label",
+                                                                "style": "body",
+                                                                "maxLines": 2
+                                                              }
+                                                            }
+                                                          },
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.sub",
+                                                                "style": "caption",
+                                                                "color": "textSecondary",
+                                                                "maxLines": 2
+                                                              }
+                                                            },
+                                                            "modifiers": {
+                                                              "hiddenPath": "$item.noSub"
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Spacer",
+                                                      "props": {}
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Icon",
+                                                      "props": {
+                                                        "name": "check",
+                                                        "size": 20,
+                                                        "tint": "accentPrimary"
                                                       }
+                                                    },
+                                                    "modifiers": {
+                                                      "accessibilityRole": "decorative",
+                                                      "hiddenPath": "$item.notSelected"
                                                     }
-                                                  ]
-                                                }
-                                              },
-                                              "modifiers": {
-                                                "height": 36,
-                                                "padding": {
-                                                  "leading": 16,
-                                                  "trailing": 16,
-                                                  "top": 0,
-                                                  "bottom": 0
-                                                },
-                                                "cornerRadius": 18,
-                                                "border": {
-                                                  "width": 1,
-                                                  "color": {
-                                                    "token": "textPrimary"
                                                   }
-                                                }
+                                                ]
+                                              }
+                                            },
+                                            "modifiers": {
+                                              "fillMaxWidth": true,
+                                              "padding": {
+                                                "top": 15,
+                                                "bottom": 15
                                               }
                                             }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "padding": {
-                                          "leading": 0,
-                                          "trailing": 0,
-                                          "top": 4,
-                                          "bottom": 4
-                                        },
-                                        "onTap": {
-                                          "actionId": "himi.open",
-                                          "params": {
-                                            "screenId": "himi_time",
-                                            "id": "$item.id"
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Divider",
+                                              "props": {}
+                                            }
                                           }
-                                        },
-                                        "accessibilityRole": "button",
-                                        "accessibilityLabel": "$item.bookA11y",
-                                        "pressFeedback": "scale",
-                                        "haptic": "light",
-                                        "hiddenPath": "$item.noBook"
+                                        ]
                                       }
+                                    },
+                                    "modifiers": {
+                                      "fillMaxWidth": true,
+                                      "onTap": {
+                                        "actionId": "tier5.himiBookingServices.selectLocation",
+                                        "params": {
+                                          "locationId": "$item.id"
+                                        }
+                                      },
+                                      "pressFeedback": "highlight",
+                                      "accessibilityRole": "button",
+                                      "accessibilityLabel": "$item.a11y"
                                     }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "fillMaxWidth": true,
-                                "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
-                                  "top": 14,
-                                  "bottom": 14
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Divider",
-                                "props": {}
+                                  }
+                                ]
                               }
                             }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "onTap": {
-                          "actionId": "himi.open",
-                          "params": {
-                            "screenId": "$item.detailScreenId",
-                            "id": "$item.id"
                           }
-                        },
-                        "pressFeedback": "highlight",
-                        "haptic": "light",
-                        "accessibilityLabel": "$item.a11y",
-                        "transition": {
-                          "enter": "fadeSlide",
-                          "direction": "up",
-                          "distance": 8
-                        }
+                        ]
+                      }
+                    },
+                    "modifiers": {
+                      "padding": {
+                        "leading": 20,
+                        "trailing": 20,
+                        "top": 8,
+                        "bottom": 24
                       }
                     }
-                  ]
+                  }
                 }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 0,
-                  "trailing": 0,
-                  "top": 12,
-                  "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.hideRows"
               }
-            },
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "padding": {
+          "leading": 0,
+          "trailing": 0,
+          "bottom": 24
+        },
+        "onAppear": {
+          "actionId": "tier5.himiBookingServices.load",
+          "params": {
+            "copy": "{\"services.subtitle\":\"Find a class and book your spot.\"}"
+          }
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-booking-services",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api",
+        "local_database",
+        "app_info"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    },
+    "stickyHeader": {
+      "id": "himi_services.header",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 0,
+          "alignment": "leading",
+          "children": [
             {
               "id": "",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 8,
+                  "spacing": 4,
                   "alignment": "leading",
                   "children": [
                     {
-                      "id": "",
+                      "id": "himi_services.title",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "More services did not load.",
-                          "style": "caption",
-                          "color": "textSecondary"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_services.retry_page",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Try again",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.retry"
-                          }
+                          "text": "Services",
+                          "style": "title1"
                         }
                       }
                     }
@@ -21290,46 +21713,32 @@ const SCREENS = runtimeSetting({
                 "padding": {
                   "leading": 20,
                   "trailing": 20,
-                  "top": 12,
+                  "top": 0,
                   "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.collection.noPageError"
+                }
               }
             },
             {
-              "id": "himi_services.empty_source",
+              "id": "",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 10,
-                  "alignment": "center",
+                  "spacing": 0,
+                  "alignment": "leading",
                   "children": [
                     {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Icon",
-                        "props": {
-                          "name": "calendar",
-                          "size": 28,
-                          "tint": "textTertiary"
-                        }
-                      },
-                      "modifiers": {
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "",
+                      "id": "himi_services.search",
                       "body": {
                         "package": "himalaya",
-                        "type": "Text",
+                        "type": "SearchField",
                         "props": {
-                          "text": "$service:himiBookingServices.collection.emptySourceText",
-                          "style": "body",
-                          "color": "textSecondary",
-                          "textAlign": "center"
+                          "placeholder": "Search services",
+                          "value": "$service:himiBookingServices.collection.query",
+                          "debounceMs": 200,
+                          "onChange": {
+                            "actionId": "tier5.himiBookingServices.search"
+                          }
                         }
                       }
                     }
@@ -21337,100 +21746,67 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
-                "fillMaxWidth": true,
                 "padding": {
                   "leading": 20,
                   "trailing": 20,
-                  "top": 40,
+                  "top": 16,
                   "bottom": 0
                 },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
+                "hiddenPath": "$service:himiBookingServices.collection.hideChrome"
+              }
+            },
+            {
+              "id": "himi_services.categories",
+              "body": {
+                "package": "himalaya",
+                "type": "FilterChips",
+                "props": {
+                  "chips": [],
+                  "optionsPath": "$service:himiBookingServices.categoryChips",
+                  "selectedIds": [
+                    "$service:himiBookingServices.activeCategory"
+                  ],
+                  "multiSelect": false,
+                  "onChange": {
+                    "actionId": "tier5.himiBookingServices.scrollToCategory"
+                  }
+                }
+              },
+              "modifiers": {
+                "accessibilityLabel": "$service:himiBookingServices.categoriesLabel",
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 12,
+                  "bottom": 0
                 },
-                "hiddenPath": "$service:himiBookingServices.collection.noEmptySource"
+                "hiddenPath": "$service:himiBookingServices.hideCategories"
               }
             },
             {
-              "id": "himi_services.empty",
+              "id": "",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 16,
-                  "alignment": "center",
+                  "spacing": 0,
                   "children": [
                     {
-                      "id": "himi_services.no_match_text",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiBookingServices.noMatchText",
-                          "style": "body",
-                          "color": "textSecondary",
-                          "textAlign": "center"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_services.empty.cta",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Clear Search",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.search",
-                            "params": {
-                              "value": ""
-                            }
-                          }
-                        }
-                      },
-                      "modifiers": {
-                        "hiddenPath": "$service:himiBookingServices.noQuery"
-                      }
-                    },
-                    {
-                      "id": "himi_services.empty.show_all",
+                      "id": "",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Show All",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.collectionFilter",
-                            "args": {
-                              "selectedIds": [
-                                "all"
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      "modifiers": {
-                        "hiddenPath": "$service:himiBookingServices.hasQuery"
+                        "type": "Divider",
+                        "props": {}
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
-                "fillMaxWidth": true,
                 "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 40,
-                  "bottom": 0
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
+                  "top": 12
                 },
-                "hiddenPath": "$service:himiBookingServices.collection.noEmpty"
+                "fillMaxWidth": true
               }
             }
           ]
@@ -21441,46 +21817,25 @@ const SCREENS = runtimeSetting({
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 0,
-          "trailing": 0,
-          "top": 18,
-          "bottom": 24
+          "top": 18
         },
-        "onAppear": {
-          "actionId": "tier5.himiBookingServices.load",
-          "params": {
-            "copy": "{\"services.subtitle\":\"Find a class and book your spot.\"}"
-          }
-        }
+        "fillMaxWidth": true
       }
     },
-    "logicBundle": {
-      "url": "http://localhost:8190/v1/bundles/himi-booking-services",
-      "integrity": "",
-      "contentType": "application/javascript+ts-bundle",
-      "declaredCapabilities": [
-        "wix_api",
-        "local_database"
-      ],
-      "minBinaryVersion": "0.1.0",
-      "bundleVersion": "0.0.1"
-    },
     "topBar": {
       "actions": [
         {
-          "id": "bookings",
-          "icon": "calendar",
-          "accessibilityLabel": "My Bookings",
+          "id": "location",
+          "icon": "location",
+          "accessibilityLabel": "Choose a location",
           "onTap": {
-            "actionId": "himi.open",
-            "params": {
-              "screenId": "himi_bookings"
-            }
-          }
+            "actionId": "tier5.himiBookingServices.openLocations"
+          },
+          "hiddenPath": "$service:brandedLiteNav.noLocationMenu"
         },
         {
           "id": "agenda",
-          "icon": "list",
+          "icon": "calendar",
           "accessibilityLabel": "Agenda",
           "onTap": {
             "actionId": "himi.open",
@@ -21607,29 +21962,45 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "himi_bookings.tabs",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "SegmentedControl",
+                "type": "VStack",
                 "props": {
-                  "options": [
-                    {
-                      "id": "upcoming",
-                      "label": "Upcoming"
-                    },
-                    {
-                      "id": "past",
-                      "label": "Past"
-                    },
+                  "spacing": 0,
+                  "alignment": "leading",
+                  "children": [
                     {
-                      "id": "cancelled",
-                      "label": "Canceled"
+                      "id": "himi_bookings.tabs",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "SegmentedControl",
+                        "props": {
+                          "options": [
+                            {
+                              "id": "upcoming",
+                              "label": "Upcoming"
+                            },
+                            {
+                              "id": "past",
+                              "label": "Past"
+                            },
+                            {
+                              "id": "cancelled",
+                              "label": "Canceled"
+                            }
+                          ],
+                          "selectedId": "$service:himiBookingBookings.tab",
+                          "onChange": {
+                            "actionId": "tier5.himiBookingBookings.selectTab"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true
+                      }
                     }
-                  ],
-                  "selectedId": "$service:himiBookingBookings.tab",
-                  "onChange": {
-                    "actionId": "tier5.himiBookingBookings.selectTab"
-                  }
+                  ]
                 }
               },
               "modifiers": {
@@ -23901,8 +24272,8 @@ const SCREENS = runtimeSetting({
                               },
                               "modifiers": {
                                 "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
+                                  "leading": 16,
+                                  "trailing": 16,
                                   "top": 14,
                                   "bottom": 14
                                 },
@@ -24008,8 +24379,8 @@ const SCREENS = runtimeSetting({
                               },
                               "modifiers": {
                                 "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
+                                  "leading": 16,
+                                  "trailing": 16,
                                   "top": 14,
                                   "bottom": 14
                                 },
@@ -24115,8 +24486,8 @@ const SCREENS = runtimeSetting({
                               },
                               "modifiers": {
                                 "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
+                                  "leading": 16,
+                                  "trailing": 16,
                                   "top": 14,
                                   "bottom": 14
                                 },
@@ -24387,7 +24758,9 @@ const SCREENS = runtimeSetting({
                                         "actionId": "himi.open",
                                         "params": {
                                           "screenId": "himi_service",
-                                          "id": "$item.serviceId"
+                                          "id": "$item.serviceId",
+                                          "sessionId": "$item.sessionId",
+                                          "start": "$item.start"
                                         }
                                       },
                                       "pressFeedback": "highlight",
@@ -24554,7 +24927,9 @@ const SCREENS = runtimeSetting({
                                                 "actionId": "himi.open",
                                                 "params": {
                                                   "screenId": "himi_service",
-                                                  "id": "$item.serviceId"
+                                                  "id": "$item.serviceId",
+                                                  "sessionId": "$item.sessionId",
+                                                  "start": "$item.start"
                                                 }
                                               },
                                               "accessibilityRole": "button",
@@ -24743,6 +25118,8 @@ const SCREENS = runtimeSetting({
                             },
                             "modifiers": {
                               "padding": {
+                                "leading": 16,
+                                "trailing": 16,
                                 "top": 14,
                                 "bottom": 14
                               },
@@ -24755,20 +25132,22 @@ const SCREENS = runtimeSetting({
                               "package": "himalaya",
                               "type": "Divider",
                               "props": {}
+                            },
+                            "modifiers": {
+                              "hiddenPath": "$item.lastOfDay"
                             }
                           }
                         ]
                       }
                     }
+                  },
+                  "onVisibleDateChange": {
+                    "actionId": "tier5.himiBrandedAgenda.visibleDate"
                   }
                 }
               },
               "modifiers": {
                 "fillMaxWidth": true,
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20
-                },
                 "hiddenPath": "$service:himiBrandedAgenda.listHidden"
               }
             },
@@ -24889,6 +25268,58 @@ const SCREENS = runtimeSetting({
                 "hiddenPath": "$service:himiBrandedAgenda.notNothingAhead"
               }
             },
+            {
+              "id": "himi_agenda.location_empty",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 22,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "No classes at this location in the coming weeks.",
+                          "style": "body",
+                          "color": "textPrimary",
+                          "textAlign": "center"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_agenda.all_locations",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Show all locations",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBrandedAgenda.selectLocation",
+                            "params": {
+                              "locationId": ""
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 28,
+                  "trailing": 28,
+                  "top": 48
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:himiBrandedAgenda.notLocationEmpty"
+              }
+            },
             {
               "id": "himi_agenda.sheet",
               "body": {
@@ -24993,7 +25424,9 @@ const SCREENS = runtimeSetting({
                                           "nav": {
                                             "screenId": "himi_service",
                                             "args": {
-                                              "id": "$service:himiBrandedAgenda.sheetServiceId"
+                                              "id": "$service:himiBrandedAgenda.sheetServiceId",
+                                              "sessionId": "$service:himiBrandedAgenda.sheetSessionId",
+                                              "start": "$service:himiBrandedAgenda.sheetStart"
                                             }
                                           }
                                         }
@@ -25022,34 +25455,212 @@ const SCREENS = runtimeSetting({
                                     }
                                   },
                                   {
-                                    "id": "himi_agenda.leave_waitlist",
+                                    "id": "himi_agenda.leave_waitlist",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Button",
+                                      "props": {
+                                        "title": "Leave Waitlist",
+                                        "style": "tertiary",
+                                        "leadingIcon": "close",
+                                        "fullWidth": true,
+                                        "disabledPath": "$service:himiBrandedAgenda.sheetBusy",
+                                        "role": "destructive",
+                                        "action": {
+                                          "actionId": "tier5.himiBrandedAgenda.cancelBooking"
+                                        }
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "hiddenPath": "$service:himiBrandedAgenda.sheetHideLeave"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            "modifiers": {
+                              "padding": {
+                                "top": 12
+                              },
+                              "fillMaxWidth": true
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    "modifiers": {
+                      "padding": {
+                        "leading": 20,
+                        "trailing": 20,
+                        "top": 8,
+                        "bottom": 24
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            {
+              "id": "himi_agenda.location_sheet",
+              "body": {
+                "package": "himalaya",
+                "type": "BottomSheet",
+                "props": {
+                  "presentedPath": "$service:himiBrandedAgenda.locationSheetOpen",
+                  "dismissible": true,
+                  "showGrabber": true,
+                  "onDismiss": {
+                    "actionId": "tier5.himiBrandedAgenda.closeLocations"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 8,
+                        "alignment": "leading",
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "Choose a location",
+                                "style": "title3"
+                              }
+                            }
+                          },
+                          {
+                            "id": "himi_agenda.location_options",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Grid",
+                              "props": {
+                                "columns": 1,
+                                "spacing": 0,
+                                "itemsPath": "$service:himiBrandedAgenda.locationOptions",
+                                "items": [
+                                  {
+                                    "id": "",
                                     "body": {
                                       "package": "himalaya",
-                                      "type": "Button",
+                                      "type": "VStack",
                                       "props": {
-                                        "title": "Leave Waitlist",
-                                        "style": "tertiary",
-                                        "leadingIcon": "close",
-                                        "fullWidth": true,
-                                        "disabledPath": "$service:himiBrandedAgenda.sheetBusy",
-                                        "role": "destructive",
-                                        "action": {
-                                          "actionId": "tier5.himiBrandedAgenda.cancelBooking"
-                                        }
+                                        "spacing": 0,
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "HStack",
+                                              "props": {
+                                                "spacing": 12,
+                                                "alignment": "center",
+                                                "children": [
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "VStack",
+                                                      "props": {
+                                                        "spacing": 2,
+                                                        "alignment": "leading",
+                                                        "children": [
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.label",
+                                                                "style": "body",
+                                                                "maxLines": 2
+                                                              }
+                                                            }
+                                                          },
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.sub",
+                                                                "style": "caption",
+                                                                "color": "textSecondary",
+                                                                "maxLines": 2
+                                                              }
+                                                            },
+                                                            "modifiers": {
+                                                              "hiddenPath": "$item.noSub"
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Spacer",
+                                                      "props": {}
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Icon",
+                                                      "props": {
+                                                        "name": "check",
+                                                        "size": 20,
+                                                        "tint": "accentPrimary"
+                                                      }
+                                                    },
+                                                    "modifiers": {
+                                                      "accessibilityRole": "decorative",
+                                                      "hiddenPath": "$item.notSelected"
+                                                    }
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "modifiers": {
+                                              "fillMaxWidth": true,
+                                              "padding": {
+                                                "top": 15,
+                                                "bottom": 15
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Divider",
+                                              "props": {}
+                                            }
+                                          }
+                                        ]
                                       }
                                     },
                                     "modifiers": {
-                                      "hiddenPath": "$service:himiBrandedAgenda.sheetHideLeave"
+                                      "fillMaxWidth": true,
+                                      "onTap": {
+                                        "actionId": "tier5.himiBrandedAgenda.selectLocation",
+                                        "params": {
+                                          "locationId": "$item.id"
+                                        }
+                                      },
+                                      "pressFeedback": "highlight",
+                                      "accessibilityRole": "button",
+                                      "accessibilityLabel": "$item.a11y"
                                     }
                                   }
                                 ]
                               }
-                            },
-                            "modifiers": {
-                              "padding": {
-                                "top": 12
-                              },
-                              "fillMaxWidth": true
                             }
                           }
                         ]
@@ -25291,76 +25902,159 @@ const SCREENS = runtimeSetting({
                         "top": 16,
                         "bottom": 16
                       },
-                      "fillMaxWidth": true
+                      "fillMaxWidth": true
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "onAppear": {
+          "actionId": "tier5.himiBrandedAgenda.load",
+          "params": {
+            "firstWeekday": "0",
+            "signInPresentation": "sheet"
+          }
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-branded-lite-agenda?integrity=",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api",
+        "app_info",
+        "calendar",
+        "open_url",
+        "local_database"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    },
+    "topBar": {
+      "leading": "none"
+    },
+    "stickyHeader": {
+      "id": "himi_agenda.header",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 0,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 0,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "himi_agenda.back",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Back",
+                          "action": {
+                            "actionId": "nav.back",
+                            "presentation": "back"
+                          },
+                          "style": "tertiary",
+                          "iconOnly": true,
+                          "leadingIcon": "chevron_left",
+                          "cornerRadius": 22,
+                          "minHeight": 44
+                        }
+                      },
+                      "modifiers": {
+                        "width": 44,
+                        "height": 44,
+                        "accessibilityLabel": "Back",
+                        "accessibilityRole": "button"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    },
+                    {
+                      "id": "himi_agenda.location",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "location",
+                                  "size": 22,
+                                  "tint": "textPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBrandedAgenda.locationActive"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "location",
+                                  "size": 22,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBrandedAgenda.noLocationActive"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "width": 44,
+                        "height": 44,
+                        "onTap": {
+                          "actionId": "tier5.himiBrandedAgenda.openLocations"
+                        },
+                        "pressFeedback": "highlight",
+                        "accessibilityRole": "button",
+                        "accessibilityLabel": "$service:himiBrandedAgenda.locationA11y",
+                        "accessibilityHint": "Choose a location",
+                        "hiddenPath": "$service:himiBrandedAgenda.noLocationMenu"
+                      }
                     }
-                  }
-                }
-              }
-            }
-          ]
-        }
-      },
-      "modifiers": {
-        "background": {
-          "token": "surfacePrimary"
-        },
-        "onAppear": {
-          "actionId": "tier5.himiBrandedAgenda.load",
-          "params": {
-            "firstWeekday": "0",
-            "signInPresentation": "sheet"
-          }
-        }
-      }
-    },
-    "logicBundle": {
-      "url": "http://localhost:8190/v1/bundles/himi-branded-lite-agenda?integrity=",
-      "integrity": "",
-      "contentType": "application/javascript+ts-bundle",
-      "declaredCapabilities": [
-        "wix_api",
-        "app_info",
-        "calendar",
-        "open_url"
-      ],
-      "minBinaryVersion": "0.1.0",
-      "bundleVersion": "0.0.1"
-    },
-    "topBar": {
-      "leading": "none"
-    },
-    "stickyHeader": {
-      "id": "himi_agenda.header",
-      "body": {
-        "package": "himalaya",
-        "type": "VStack",
-        "props": {
-          "spacing": 0,
-          "alignment": "leading",
-          "children": [
-            {
-              "id": "himi_agenda.back",
-              "body": {
-                "package": "himalaya",
-                "type": "Button",
-                "props": {
-                  "title": "Back",
-                  "action": {
-                    "actionId": "nav.back",
-                    "presentation": "back"
-                  },
-                  "style": "tertiary",
-                  "iconOnly": true,
-                  "leadingIcon": "chevron_left",
-                  "cornerRadius": 22,
-                  "minHeight": 44
+                  ]
                 }
               },
               "modifiers": {
-                "width": 44,
-                "height": 44,
-                "accessibilityLabel": "Back",
-                "accessibilityRole": "button"
+                "fillMaxWidth": true,
+                "padding": {
+                  "trailing": 4
+                }
               }
             },
             {
@@ -40007,7 +40701,20 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "alignment": "leading",
                           "children": [
                             {
-                              "id": "",
+                              "id": "himi_service.title",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingService.name",
+                                  "style": "pageTitle",
+                                  "maxLines": 3,
+                                  "collapseWhenEmpty": true
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_service.session_when",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
@@ -40016,62 +40723,59 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "alignment": "center",
                                   "children": [
                                     {
-                                      "id": "himi_service.category",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "Icon",
                                         "props": {
-                                          "text": "$service:himiBookingService.category",
-                                          "style": "footnote",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "name": "calendar",
+                                          "size": 20,
+                                          "tint": "textSecondary"
                                         }
                                       },
                                       "modifiers": {
-                                        "hiddenPath": "$service:himiBookingService.noCategory"
+                                        "accessibilityRole": "decorative"
                                       }
                                     },
                                     {
-                                      "id": "himi_service.type_tag",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$service:himiBookingService.typeTag",
-                                          "style": "caption",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "text": "$service:himiBookingService.sessionWhen",
+                                          "style": "bodyEmphasis",
+                                          "maxLines": 2
                                         }
                                       },
                                       "modifiers": {
-                                        "background": {
-                                          "token": "surfaceTertiary"
-                                        },
-                                        "cornerRadius": 4,
-                                        "padding": {
-                                          "leading": 8,
-                                          "trailing": 8,
-                                          "top": 2,
-                                          "bottom": 2
-                                        },
-                                        "hiddenPath": "$service:himiBookingService.noTypeTag"
+                                        "weight": 1
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_service.change_time",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Button",
+                                        "props": {
+                                          "title": "Change Time",
+                                          "style": "tertiary",
+                                          "size": "sm",
+                                          "action": {
+                                            "actionId": "tier5.himiBookingService.changeTime"
+                                          }
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingService.noChangeTime"
                                       }
                                     }
                                   ]
                                 }
-                              }
-                            },
-                            {
-                              "id": "himi_service.title",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "$service:himiBookingService.name",
-                                  "style": "pageTitle",
-                                  "maxLines": 3,
-                                  "collapseWhenEmpty": true
-                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiBookingService.noSession"
                               }
                             },
                             {
@@ -40182,6 +40886,104 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "spacing": 16,
                                   "alignment": "leading",
                                   "children": [
+                                    {
+                                      "id": "himi_service.session",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 12,
+                                          "alignment": "center",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "ZStack",
+                                                "props": {
+                                                  "alignment": "center",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Icon",
+                                                        "props": {
+                                                          "name": "calendar",
+                                                          "size": 20,
+                                                          "tint": "textSecondary"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative"
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "width": 20,
+                                                "height": 20
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "VStack",
+                                                "props": {
+                                                  "spacing": 2,
+                                                  "alignment": "leading",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$service:himiBookingService.sessionDate",
+                                                          "style": "body",
+                                                          "color": "textPrimary",
+                                                          "maxLines": 2
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$service:himiBookingService.sessionTime",
+                                                          "style": "caption",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 1,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Spacer",
+                                                "props": {}
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "fillMaxWidth": true,
+                                        "accessibilityLabel": "$service:himiBookingService.sessionDate",
+                                        "accessibilityValue": "$service:himiBookingService.sessionTime",
+                                        "hiddenPath": "$service:himiBookingService.noSession"
+                                      }
+                                    },
                                     {
                                       "id": "himi_service.course_dates",
                                       "body": {
@@ -41580,7 +42382,11 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "bottom": 24
         },
         "onAppear": {
-          "actionId": "tier5.himiBookingService.load"
+          "actionId": "tier5.himiBookingService.load",
+          "params": {
+            "signInScreenId": "himi_sign_in",
+            "signInPresentation": "sheet"
+          }
         }
       }
     },
@@ -41637,6 +42443,77 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 "props": {
                   "spacing": 0,
                   "children": [
+                    {
+                      "id": "himi_service.session_message",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "check",
+                                  "size": 20,
+                                  "tint": "success"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBookingService.sessionMessageFailed"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "info",
+                                  "size": 20,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBookingService.sessionMessageOk"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingService.sessionMessage",
+                                  "style": "footnote",
+                                  "color": "textPrimary",
+                                  "maxLines": 2
+                                }
+                              },
+                              "modifiers": {
+                                "weight": 1,
+                                "announce": {
+                                  "politeness": "polite"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "padding": {
+                          "bottom": 12
+                        },
+                        "hiddenPath": "$service:himiBookingService.noSessionMessage"
+                      }
+                    },
                     {
                       "id": "himi_service.choose_time",
                       "body": {
@@ -41762,6 +42639,251 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                       "modifiers": {
                         "hiddenPath": "$service:himiBookingService.noCourseCtaClosed"
                       }
+                    },
+                    {
+                      "id": "himi_service.session_book",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Book",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.book"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noSessionBook"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_request",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Request to Book",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.book"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noSessionRequest"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_waitlist",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Join Waitlist",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.joinWaitlist"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noSessionWaitlist"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_closed",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingService.closedLabel",
+                                  "style": "footnote",
+                                  "color": "textSecondary",
+                                  "maxLines": 1,
+                                  "textAlign": "center"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityHidden": true
+                              }
+                            },
+                            {
+                              "id": "himi_service.session_book_closed",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Button",
+                                "props": {
+                                  "title": "Book",
+                                  "style": "primary",
+                                  "fullWidth": true,
+                                  "disabled": true,
+                                  "action": {
+                                    "actionId": "tier5.himiBookingService.book"
+                                  }
+                                }
+                              },
+                              "modifiers": {
+                                "height": 48,
+                                "cornerRadius": 8,
+                                "accessibilityValue": "$service:himiBookingService.closedLabel"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiBookingService.noSessionClosed"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_booked",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "check",
+                                          "size": 20,
+                                          "tint": "success"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Booked",
+                                          "style": "bodyEmphasis",
+                                          "color": "textPrimary",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "height": 48,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "cornerRadius": 8,
+                        "hiddenPath": "$service:himiBookingService.noSessionBooked"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_waitlisted",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "clock",
+                                          "size": 20,
+                                          "tint": "textSecondary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "On waitlist",
+                                          "style": "bodyEmphasis",
+                                          "color": "textPrimary",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "height": 48,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "cornerRadius": 8,
+                        "hiddenPath": "$service:himiBookingService.noSessionWaitlisted"
+                      }
                     }
                   ]
                 }