@wix/himalaya-cli 0.1526.0 → 0.1528.0

package/templates/yoga-studio/dev/index.ts

@@ -30486,234 +30486,1570 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
         "package": "himalaya",
         "type": "VStack",
         "props": {
-          "spacing": 16,
+          "spacing": 0,
           "alignment": "leading",
           "children": [
             {
-              "id": "himi_time.retry.block",
+              "id": "himi_time.location_sheet",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "BottomSheet",
                 "props": {
-                  "spacing": 12,
-                  "alignment": "leading",
-                  "children": [
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "HStack",
-                        "props": {
-                          "spacing": 10,
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Icon",
-                                "props": {
-                                  "name": "warning",
-                                  "size": 18,
-                                  "tint": "accentPrimary"
-                                }
-                              },
-                              "modifiers": {
-                                "accessibilityRole": "decorative"
+                  "presentedPath": "$service:himiBookingTime.locationSheetOpen",
+                  "dismissible": true,
+                  "showGrabber": true,
+                  "onDismiss": {
+                    "actionId": "tier5.himiBookingTime.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": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Something did not load.",
-                                  "style": "bodyEmphasis"
-                                }
+                            }
+                          },
+                          {
+                            "id": "himi_time.location_options",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Grid",
+                              "props": {
+                                "columns": 1,
+                                "spacing": 0,
+                                "itemsPath": "$service:himiBookingTime.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": {
+                                              "fillMaxWidth": true,
+                                              "padding": {
+                                                "top": 15,
+                                                "bottom": 15
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Divider",
+                                              "props": {}
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "fillMaxWidth": true,
+                                      "onTap": {
+                                        "actionId": "tier5.himiBookingTime.selectLocation",
+                                        "params": {
+                                          "locationId": "$item.id"
+                                        }
+                                      },
+                                      "pressFeedback": "highlight",
+                                      "accessibilityRole": "button",
+                                      "accessibilityLabel": "$item.a11y"
+                                    }
+                                  }
+                                ]
                               }
                             }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Try again when the connection settles.",
-                          "style": "body",
-                          "color": "textSecondary"
-                        }
+                          }
+                        ]
                       }
                     },
-                    {
-                      "id": "himi_time.retry",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Try again",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingTime.load"
-                          }
-                        }
+                    "modifiers": {
+                      "padding": {
+                        "leading": 20,
+                        "trailing": 20,
+                        "top": 8,
+                        "bottom": 24
                       }
                     }
-                  ]
-                }
-              },
-              "modifiers": {
-                "background": {
-                  "token": "surfaceElevated"
-                },
-                "border": {
-                  "width": 1,
-                  "color": {
-                    "token": "border"
                   }
-                },
-                "cornerRadius": 8,
-                "padding": {
-                  "leading": 14,
-                  "trailing": 14,
-                  "top": 14,
-                  "bottom": 14
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
-                },
-                "hiddenPath": "$service:himiBookingTime.notErrored"
+                }
               }
             },
             {
-              "id": "",
+              "id": "himi_time.result",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "BottomSheet",
                 "props": {
-                  "spacing": 10,
-                  "children": [
-                    {
-                      "id": "himi_time.skeleton_1",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 64,
-                          "cornerRadius": 8
-                        }
-                      },
-                      "modifiers": {
-                        "height": 64,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "himi_time.skeleton_2",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 64,
-                          "cornerRadius": 8
-                        }
-                      },
-                      "modifiers": {
-                        "height": 64,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
+                  "presentedPath": "$service:himiBookingTime.resultSticky",
+                  "modal": false,
+                  "placement": "inline",
+                  "showGrabber": false,
+                  "label": "$service:himiBookingTime.resultText",
+                  "onDismiss": {
+                    "actionId": "tier5.himiBookingTime.closeResult"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 12,
+                        "alignment": "leading",
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "HStack",
+                              "props": {
+                                "spacing": 12,
+                                "alignment": "center",
+                                "children": [
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Icon",
+                                      "props": {
+                                        "name": "check",
+                                        "size": 24,
+                                        "tint": "accentPrimary"
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "accessibilityRole": "decorative"
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$service:himiBookingTime.resultText",
+                                        "style": "body",
+                                        "maxLines": 4
+                                      }
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Spacer",
+                                      "props": {}
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Icon",
+                                      "props": {
+                                        "name": "close",
+                                        "size": 20,
+                                        "tint": "textSecondary"
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "accessibilityRole": "button",
+                                      "onTap": {
+                                        "actionId": "tier5.himiBookingTime.closeResult"
+                                      },
+                                      "accessibilityLabel": "Close",
+                                      "padding": {
+                                        "top": 4,
+                                        "bottom": 4,
+                                        "leading": 4,
+                                        "trailing": 4
+                                      }
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          },
+                          {
+                            "id": "himi_time.result.bookings",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Button",
+                              "props": {
+                                "title": "View My Bookings",
+                                "style": "secondary",
+                                "fullWidth": true,
+                                "action": {
+                                  "actionId": "himi.open",
+                                  "params": {
+                                    "screenId": "himi_bookings"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        ]
                       }
                     },
-                    {
-                      "id": "himi_time.skeleton_3",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 64,
-                          "cornerRadius": 8
-                        }
-                      },
-                      "modifiers": {
-                        "height": 64,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
+                    "modifiers": {
+                      "padding": {
+                        "leading": 16,
+                        "trailing": 16,
+                        "top": 16,
+                        "bottom": 16
                       }
                     }
-                  ]
+                  }
                 }
-              },
-              "modifiers": {
-                "hiddenPath": "$service:himiBookingTime.notLoading"
               }
             },
             {
-              "id": "",
+              "id": "himi_time.result_info",
+              "body": {
+                "package": "himalaya",
+                "type": "BottomSheet",
+                "props": {
+                  "presentedPath": "$service:himiBookingTime.resultAuto",
+                  "modal": false,
+                  "placement": "inline",
+                  "showGrabber": false,
+                  "autoDismissMs": 8000,
+                  "label": "$service:himiBookingTime.resultText",
+                  "onDismiss": {
+                    "actionId": "tier5.himiBookingTime.closeResult"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 12,
+                        "alignment": "leading",
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "HStack",
+                              "props": {
+                                "spacing": 12,
+                                "alignment": "center",
+                                "children": [
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Icon",
+                                      "props": {
+                                        "name": "info",
+                                        "size": 24,
+                                        "tint": "accentPrimary"
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "accessibilityRole": "decorative"
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$service:himiBookingTime.resultText",
+                                        "style": "body",
+                                        "maxLines": 4
+                                      }
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Spacer",
+                                      "props": {}
+                                    }
+                                  },
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Icon",
+                                      "props": {
+                                        "name": "close",
+                                        "size": 20,
+                                        "tint": "textSecondary"
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "accessibilityRole": "button",
+                                      "onTap": {
+                                        "actionId": "tier5.himiBookingTime.closeResult"
+                                      },
+                                      "accessibilityLabel": "Close",
+                                      "padding": {
+                                        "top": 4,
+                                        "bottom": 4,
+                                        "leading": 4,
+                                        "trailing": 4
+                                      }
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    "modifiers": {
+                      "padding": {
+                        "leading": 16,
+                        "trailing": 16,
+                        "top": 16,
+                        "bottom": 16
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            {
+              "id": "himi_time.retry.block",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 14,
+                  "spacing": 12,
                   "alignment": "leading",
                   "children": [
                     {
-                      "id": "himi_time.service_header",
+                      "id": "",
                       "body": {
                         "package": "himalaya",
                         "type": "HStack",
                         "props": {
-                          "spacing": 12,
+                          "spacing": 10,
                           "children": [
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Image",
+                                "type": "Icon",
                                 "props": {
-                                  "url": "$service:himiBookingTime.serviceImage",
-                                  "width": 64,
-                                  "height": 64,
-                                  "contentMode": "fill",
-                                  "contentDescription": "$service:himiBookingTime.serviceName"
+                                  "name": "warning",
+                                  "size": 18,
+                                  "tint": "accentPrimary"
                                 }
                               },
                               "modifiers": {
-                                "cornerRadius": 8,
-                                "hiddenPath": "$service:himiBookingTime.noServiceImage"
+                                "accessibilityRole": "decorative"
                               }
                             },
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Text",
                                 "props": {
-                                  "spacing": 4,
-                                  "alignment": "leading",
-                                  "children": [
+                                  "text": "Something did not load.",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Try again when the connection settles.",
+                          "style": "body",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_time.retry",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingTime.load"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 8,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 18,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingTime.notErrored"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 18,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 14,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "himi_time.skeleton_image",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 56,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 56,
+                                "width": 56,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "himi_time.skeleton_name",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Skeleton",
+                                        "props": {
+                                          "height": 18,
+                                          "cornerRadius": 8
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "height": 18,
+                                        "width": 180,
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 8,
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_time.skeleton_line",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Skeleton",
+                                        "props": {
+                                          "height": 14,
+                                          "cornerRadius": 8
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "height": 14,
+                                        "width": 120,
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 8,
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_time.skeleton_days",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "height": 32,
+                          "cornerRadius": 8
+                        }
+                      },
+                      "modifiers": {
+                        "height": 32,
+                        "fillMaxWidth": true,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "cornerRadius": 8,
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Divider",
+                        "props": {}
+                      }
+                    },
+                    {
+                      "id": "himi_time.skeleton_day",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "height": 16,
+                          "cornerRadius": 8
+                        }
+                      },
+                      "modifiers": {
+                        "height": 16,
+                        "width": 100,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "cornerRadius": 8,
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 10,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "himi_time.skeleton_avatar",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 26,
+                                  "cornerRadius": 13
+                                }
+                              },
+                              "modifiers": {
+                                "height": 26,
+                                "width": 26,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 13,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_time.skeleton_staff",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 16,
+                                  "cornerRadius": 8
+                                }
+                              },
+                              "modifiers": {
+                                "height": 16,
+                                "width": 120,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 8,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 12,
+                          "children": [
+                            {
+                              "id": "himi_time.skeleton_pill_1",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 44,
+                                  "cornerRadius": 22
+                                }
+                              },
+                              "modifiers": {
+                                "height": 44,
+                                "fillMaxWidth": true,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 22,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_time.skeleton_pill_2",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 44,
+                                  "cornerRadius": 22
+                                }
+                              },
+                              "modifiers": {
+                                "height": 44,
+                                "fillMaxWidth": true,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 22,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 12,
+                          "children": [
+                            {
+                              "id": "himi_time.skeleton_pill_3",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 44,
+                                  "cornerRadius": 22
+                                }
+                              },
+                              "modifiers": {
+                                "height": 44,
+                                "fillMaxWidth": true,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 22,
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "himi_time.skeleton_pill_4",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 44,
+                                  "cornerRadius": 22
+                                }
+                              },
+                              "modifiers": {
+                                "height": 44,
+                                "fillMaxWidth": true,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 22,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 18,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingTime.notLoading"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 0,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "himi_time.service_header",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 14,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Image",
+                                "props": {
+                                  "url": "$service:himiBookingTime.serviceImage",
+                                  "width": 56,
+                                  "height": 56,
+                                  "contentMode": "fill",
+                                  "contentDescription": "$service:himiBookingTime.serviceName"
+                                }
+                              },
+                              "modifiers": {
+                                "cornerRadius": 8,
+                                "hiddenPath": "$service:himiBookingTime.noServiceImage"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "ZStack",
+                                "props": {
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "image",
+                                          "size": 24,
+                                          "tint": "accentPrimary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "width": 56,
+                                "height": 56,
+                                "cornerRadius": 8,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "hiddenPath": "$service:himiBookingTime.hasServiceImage"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 2,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBookingTime.serviceName",
+                                          "style": "body",
+                                          "maxLines": 2,
+                                          "collapseWhenEmpty": true
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBookingTime.serviceLine",
+                                          "style": "footnote",
+                                          "color": "textSecondary",
+                                          "maxLines": 1,
+                                          "collapseWhenEmpty": true
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Spacer",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 18,
+                          "bottom": 0
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_time.days",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "FilterChips",
+                        "props": {
+                          "chips": [],
+                          "optionsPath": "$service:himiBookingTime.days",
+                          "selectedIds": [
+                            "$service:himiBookingTime.selectedDay"
+                          ],
+                          "multiSelect": false,
+                          "onChange": {
+                            "actionId": "tier5.himiBookingTime.selectDay"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityLabel": "Choose a day",
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 14,
+                          "bottom": 14
+                        },
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiBookingTime.hideDayPicker"
+                      }
+                    },
+                    {
+                      "id": "himi_time.day_row",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Divider",
+                                "props": {}
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 12,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "himi_time.day_heading",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBookingTime.selectedDayLabel",
+                                          "style": "body",
+                                          "maxLines": 1,
+                                          "collapseWhenEmpty": true
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_time.location",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 6,
+                                          "alignment": "center",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "location",
+                                                  "size": 18,
+                                                  "tint": "textPrimary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiBookingTime.locationLabel",
+                                                  "style": "footnote",
+                                                  "maxLines": 1
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "chevron_down",
+                                                  "size": 16,
+                                                  "tint": "textSecondary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative"
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "onTap": {
+                                          "actionId": "tier5.himiBookingTime.openLocations"
+                                        },
+                                        "pressFeedback": "highlight",
+                                        "accessibilityRole": "button",
+                                        "accessibilityLabel": "$service:himiBookingTime.locationA11y",
+                                        "accessibilityHint": "Choose a location",
+                                        "hiddenPath": "$service:himiBookingTime.noLocationMenu"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_time.location_single",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 6,
+                                          "alignment": "center",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "location",
+                                                  "size": 18,
+                                                  "tint": "textPrimary"
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative"
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$service:himiBookingTime.singleLocation",
+                                                  "style": "footnote",
+                                                  "maxLines": 1
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingTime.noSingleLocation"
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "padding": {
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 12,
+                                  "bottom": 12
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Divider",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingTime.hideDayPicker"
+                      }
+                    },
+                    {
+                      "id": "himi_time.booking",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "ActivityIndicator",
+                                "props": {
+                                  "size": 14
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "Booking...",
+                                  "style": "footnote",
+                                  "color": "textSecondary"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 12,
+                          "bottom": 0
+                        },
+                        "hiddenPath": "$service:himiBookingTime.notBooking"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 12,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 12,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBookingTime.iapPrice",
+                                          "style": "bodyEmphasis",
+                                          "collapseWhenEmpty": true
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_time.times_apple.form",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Grid",
+                                        "props": {
+                                          "columns": 1,
+                                          "spacing": 12,
+                                          "itemsPath": "$service:himiBookingTime.iapFields",
+                                          "items": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "VStack",
+                                                "props": {
+                                                  "spacing": 8,
+                                                  "alignment": "leading",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.sectionLabel",
+                                                          "style": "bodyEmphasis",
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.label",
+                                                          "style": "footnote"
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "himi_time.times_apple.input.$item.id",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "FragmentSlot",
+                                                        "props": {
+                                                          "casePath": "$item.kind",
+                                                          "defaultCase": "text",
+                                                          "cases": [
+                                                            {
+                                                              "id": "text",
+                                                              "content": {
+                                                                "id": "himi_time.times_apple.field.text.$item.id",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "TextField",
+                                                                  "props": {
+                                                                    "placeholder": "$item.inputLabel",
+                                                                    "value": "$item.value",
+                                                                    "onChange": {
+                                                                      "actionId": "tier5.himiBookingTime.setIapField",
+                                                                      "params": {
+                                                                        "id": "$item.fieldId"
+                                                                      }
+                                                                    },
+                                                                    "validation": {},
+                                                                    "errorText": "$item.error",
+                                                                    "autoCapitalization": "words"
+                                                                  }
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "requiredText",
+                                                              "content": {
+                                                                "id": "himi_time.times_apple.field.requiredText.$item.id",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "TextField",
+                                                                  "props": {
+                                                                    "placeholder": "$item.inputLabel",
+                                                                    "value": "$item.value",
+                                                                    "onChange": {
+                                                                      "actionId": "tier5.himiBookingTime.setIapField",
+                                                                      "params": {
+                                                                        "id": "$item.fieldId"
+                                                                      }
+                                                                    },
+                                                                    "validation": {
+                                                                      "required": true
+                                                                    },
+                                                                    "errorText": "$item.error",
+                                                                    "autoCapitalization": "words"
+                                                                  }
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "email",
+                                                              "content": {
+                                                                "id": "himi_time.times_apple.field.email.$item.id",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "TextField",
+                                                                  "props": {
+                                                                    "placeholder": "$item.inputLabel",
+                                                                    "value": "$item.value",
+                                                                    "onChange": {
+                                                                      "actionId": "tier5.himiBookingTime.setIapField",
+                                                                      "params": {
+                                                                        "id": "$item.fieldId"
+                                                                      }
+                                                                    },
+                                                                    "validation": {
+                                                                      "required": true,
+                                                                      "type": "email"
+                                                                    },
+                                                                    "errorText": "$item.error",
+                                                                    "autoCapitalization": "none"
+                                                                  }
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "number",
+                                                              "content": {
+                                                                "id": "himi_time.times_apple.field.number.$item.id",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "TextField",
+                                                                  "props": {
+                                                                    "placeholder": "$item.inputLabel",
+                                                                    "value": "$item.value",
+                                                                    "onChange": {
+                                                                      "actionId": "tier5.himiBookingTime.setIapField",
+                                                                      "params": {
+                                                                        "id": "$item.fieldId"
+                                                                      }
+                                                                    },
+                                                                    "validation": {
+                                                                      "type": "number"
+                                                                    },
+                                                                    "errorText": "$item.error",
+                                                                    "autoCapitalization": "words"
+                                                                  }
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "choice",
+                                                              "content": {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "VStack",
+                                                                  "props": {
+                                                                    "spacing": 4,
+                                                                    "children": [
+                                                                      {
+                                                                        "id": "himi_time.times_apple.options.choice",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "Grid",
+                                                                          "props": {
+                                                                            "columns": 1,
+                                                                            "spacing": 8,
+                                                                            "itemsPath": "$item.options",
+                                                                            "items": [
+                                                                              {
+                                                                                "id": "himi_time.times_apple.option.choice.$item.fieldId.$item.id",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Button",
+                                                                                  "props": {
+                                                                                    "title": "$item.displayLabel",
+                                                                                    "style": "secondary",
+                                                                                    "fullWidth": true,
+                                                                                    "action": {
+                                                                                      "actionId": "tier5.himiBookingTime.setIapField",
+                                                                                      "params": {
+                                                                                        "id": "$item.fieldId",
+                                                                                        "option": "$item.id"
+                                                                                      }
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            ]
+                                                                          }
+                                                                        }
+                                                                      },
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "FieldError",
+                                                                          "props": {
+                                                                            "text": "$item.error"
+                                                                          }
+                                                                        },
+                                                                        "modifiers": {
+                                                                          "hiddenPath": "$item.errorHidden"
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "multiple",
+                                                              "content": {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "VStack",
+                                                                  "props": {
+                                                                    "spacing": 4,
+                                                                    "children": [
+                                                                      {
+                                                                        "id": "himi_time.times_apple.options.multiple",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "Grid",
+                                                                          "props": {
+                                                                            "columns": 1,
+                                                                            "spacing": 8,
+                                                                            "itemsPath": "$item.options",
+                                                                            "items": [
+                                                                              {
+                                                                                "id": "himi_time.times_apple.option.multiple.$item.fieldId.$item.id",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Button",
+                                                                                  "props": {
+                                                                                    "title": "$item.displayLabel",
+                                                                                    "style": "secondary",
+                                                                                    "fullWidth": true,
+                                                                                    "action": {
+                                                                                      "actionId": "tier5.himiBookingTime.setIapField",
+                                                                                      "params": {
+                                                                                        "id": "$item.fieldId",
+                                                                                        "option": "$item.id"
+                                                                                      }
+                                                                                    }
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            ]
+                                                                          }
+                                                                        }
+                                                                      },
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "FieldError",
+                                                                          "props": {
+                                                                            "text": "$item.error"
+                                                                          }
+                                                                        },
+                                                                        "modifiers": {
+                                                                          "hiddenPath": "$item.errorHidden"
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                }
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingTime.iapFormHidden"
+                                      }
+                                    },
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "FieldError",
                                         "props": {
-                                          "text": "$service:himiBookingTime.serviceName",
-                                          "style": "title2",
-                                          "collapseWhenEmpty": true
+                                          "text": "",
+                                          "textPath": "$service:himiBookingTime.iapFormError"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_time.times_apple.buy",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Button",
+                                        "props": {
+                                          "title": "$service:himiBookingTime.iapBuyLabel",
+                                          "disabledPath": "$service:himiBookingTime.iapBuyDisabled",
+                                          "style": "primary",
+                                          "fullWidth": true,
+                                          "action": {
+                                            "actionId": "tier5.himiBookingTime.buyApple"
+                                          }
                                         }
                                       }
                                     },
@@ -30723,57 +32059,68 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$service:himiBookingTime.serviceLine",
-                                          "style": "body",
+                                          "text": "$service:himiBookingTime.iapNote",
+                                          "style": "footnote",
                                           "color": "textSecondary",
                                           "collapseWhenEmpty": true
                                         }
                                       }
+                                    },
+                                    {
+                                      "id": "himi_time.times_apple.signin",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Button",
+                                        "props": {
+                                          "title": "Sign in",
+                                          "style": "secondary",
+                                          "action": {
+                                            "actionId": "himi.open",
+                                            "params": {
+                                              "screenId": "himi_account"
+                                            }
+                                          }
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingTime.iapSignInHidden"
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_time.times_apple.retry",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Button",
+                                        "props": {
+                                          "title": "Refresh purchase status",
+                                          "style": "secondary",
+                                          "action": {
+                                            "actionId": "tier5.himiBookingTime.iapRefresh"
+                                          }
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingTime.iapRetryHidden"
+                                      }
                                     }
                                   ]
                                 }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBookingTime.iapBuyHidden"
                               }
                             }
                           ]
                         }
-                      }
-                    },
-                    {
-                      "id": "himi_time.days",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "FilterChips",
-                        "props": {
-                          "chips": [],
-                          "optionsPath": "$service:himiBookingTime.days",
-                          "selectedIds": [
-                            "$service:himiBookingTime.selectedDay"
-                          ],
-                          "multiSelect": false,
-                          "onChange": {
-                            "actionId": "tier5.himiBookingTime.selectDay"
-                          }
-                        }
-                      },
-                      "modifiers": {
-                        "accessibilityLabel": "Choose a day",
-                        "hiddenPath": "$service:himiBookingTime.hideDayPicker"
-                      }
-                    },
-                    {
-                      "id": "himi_time.day_heading",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiBookingTime.selectedDayLabel",
-                          "style": "title3",
-                          "maxLines": 1,
-                          "collapseWhenEmpty": true
-                        }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiBookingTime.hideDayPicker"
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 12,
+                          "bottom": 0
+                        },
+                        "hiddenPath": "$service:himiBookingTime.isCourse"
                       }
                     },
                     {
@@ -30783,8 +32130,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "type": "Grid",
                         "props": {
                           "columns": 1,
-                          "spacing": 10,
-                          "itemsPath": "$service:himiBookingTime.slots",
+                          "spacing": 24,
+                          "itemsPath": "$service:himiBookingTime.groups",
                           "items": [
                             {
                               "id": "",
@@ -30792,7 +32139,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 "package": "himalaya",
                                 "type": "VStack",
                                 "props": {
-                                  "spacing": 0,
+                                  "spacing": 18,
                                   "alignment": "leading",
                                   "children": [
                                     {
@@ -30801,290 +32148,401 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                         "package": "himalaya",
                                         "type": "HStack",
                                         "props": {
-                                          "spacing": 12,
+                                          "spacing": 10,
+                                          "alignment": "center",
                                           "children": [
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Icon",
-                                                "props": {
-                                                  "name": "checkmark",
-                                                  "size": 14,
-                                                  "tint": "accentPrimary",
-                                                  "contentDescription": "Selected"
-                                                }
-                                              },
-                                              "modifiers": {
-                                                "hiddenPath": "$item.notSelected"
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Icon",
+                                                "type": "Image",
                                                 "props": {
-                                                  "name": "circle",
-                                                  "size": 14,
-                                                  "tint": "textTertiary"
+                                                  "url": "$item.image",
+                                                  "width": 26,
+                                                  "height": 26,
+                                                  "shape": "circle",
+                                                  "contentMode": "fill"
                                                 }
                                               },
                                               "modifiers": {
                                                 "accessibilityRole": "decorative",
-                                                "hiddenPath": "$item.selected"
+                                                "hiddenPath": "$item.noImage"
                                               }
                                             },
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "VStack",
+                                                "type": "ZStack",
                                                 "props": {
-                                                  "spacing": 4,
-                                                  "alignment": "leading",
+                                                  "alignment": "center",
                                                   "children": [
                                                     {
                                                       "id": "",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.title",
-                                                          "style": "bodyEmphasis",
-                                                          "maxLines": 1
-                                                        }
-                                                      }
-                                                    },
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.subtitle",
-                                                          "style": "footnote",
-                                                          "color": "textSecondary",
-                                                          "maxLines": 1,
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      }
-                                                    },
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.badge",
-                                                          "style": "caption",
-                                                          "color": "warning",
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      },
-                                                      "modifiers": {
-                                                        "hiddenPath": "$item.badgeNeutral"
-                                                      }
-                                                    },
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
+                                                        "type": "Icon",
                                                         "props": {
-                                                          "text": "$item.badge",
-                                                          "style": "caption",
-                                                          "color": "textSecondary",
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      },
-                                                      "modifiers": {
-                                                        "hiddenPath": "$item.badgeWarning"
-                                                      }
-                                                    }
-                                                  ]
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Spacer",
-                                                "props": {}
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "background": {
-                                          "token": "surfaceElevated"
-                                        },
-                                        "border": {
-                                          "width": 1,
-                                          "color": {
-                                            "token": "border"
-                                          }
-                                        },
-                                        "cornerRadius": 8,
-                                        "padding": {
-                                          "leading": 12,
-                                          "trailing": 12,
-                                          "top": 12,
-                                          "bottom": 12
-                                        },
-                                        "onTap": {
-                                          "actionId": "tier5.himiBookingTime.selectSlot",
-                                          "params": {
-                                            "slotId": "$item.id"
-                                          }
-                                        },
-                                        "pressFeedback": "scale",
-                                        "haptic": "light",
-                                        "hiddenPath": "$item.notSelectable"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "HStack",
-                                        "props": {
-                                          "spacing": 12,
-                                          "children": [
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Icon",
-                                                "props": {
-                                                  "name": "checkmark",
-                                                  "size": 14,
-                                                  "tint": "accentPrimary",
-                                                  "contentDescription": "Selected"
+                                                          "name": "person",
+                                                          "size": 16,
+                                                          "tint": "textSecondary"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative"
+                                                      }
+                                                    }
+                                                  ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "hiddenPath": "$item.notSelected"
+                                                "width": 26,
+                                                "height": 26,
+                                                "cornerRadius": 13,
+                                                "background": {
+                                                  "token": "surfaceTertiary"
+                                                },
+                                                "hiddenPath": "$item.hasImage"
                                               }
                                             },
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Icon",
+                                                "type": "Text",
                                                 "props": {
-                                                  "name": "circle",
-                                                  "size": 14,
-                                                  "tint": "textTertiary"
+                                                  "text": "$item.name",
+                                                  "style": "bodyEmphasis",
+                                                  "maxLines": 1
                                                 }
-                                              },
-                                              "modifiers": {
-                                                "accessibilityRole": "decorative",
-                                                "hiddenPath": "$item.selected"
                                               }
-                                            },
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$item.noStaffHeader"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Grid",
+                                        "props": {
+                                          "columns": 2,
+                                          "spacing": 12,
+                                          "itemsPath": "$item.times",
+                                          "items": [
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "VStack",
                                                 "props": {
-                                                  "spacing": 4,
-                                                  "alignment": "leading",
+                                                  "spacing": 0,
                                                   "children": [
                                                     {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$item.title",
-                                                          "style": "bodyEmphasis",
-                                                          "maxLines": 1
-                                                        }
-                                                      }
-                                                    },
-                                                    {
-                                                      "id": "",
+                                                      "id": "himi_time.slot",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "Text",
+                                                        "type": "HStack",
                                                         "props": {
-                                                          "text": "$item.subtitle",
-                                                          "style": "footnote",
-                                                          "color": "textSecondary",
-                                                          "maxLines": 1,
-                                                          "collapseWhenEmpty": true
+                                                          "spacing": 0,
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Spacer",
+                                                                "props": {}
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "VStack",
+                                                                "props": {
+                                                                  "spacing": 0,
+                                                                  "alignment": "center",
+                                                                  "children": [
+                                                                    {
+                                                                      "id": "",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Text",
+                                                                        "props": {
+                                                                          "text": "$item.label",
+                                                                          "style": "bodyEmphasis",
+                                                                          "color": "textPrimary",
+                                                                          "maxLines": 1
+                                                                        }
+                                                                      }
+                                                                    },
+                                                                    {
+                                                                      "id": "",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Text",
+                                                                        "props": {
+                                                                          "text": "$item.badge",
+                                                                          "style": "caption",
+                                                                          "color": "textPrimary",
+                                                                          "maxLines": 1
+                                                                        }
+                                                                      },
+                                                                      "modifiers": {
+                                                                        "hiddenPath": "$item.noBadge"
+                                                                      }
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Spacer",
+                                                                "props": {}
+                                                              }
+                                                            }
+                                                          ]
                                                         }
+                                                      },
+                                                      "modifiers": {
+                                                        "fillMaxWidth": true,
+                                                        "padding": {
+                                                          "top": 11,
+                                                          "bottom": 11,
+                                                          "leading": 8,
+                                                          "trailing": 8
+                                                        },
+                                                        "cornerRadius": 22,
+                                                        "border": {
+                                                          "width": 1,
+                                                          "color": {
+                                                            "token": "textPrimary"
+                                                          }
+                                                        },
+                                                        "accessibilityLabel": "$item.a11y",
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiBookingTime.pickSlot",
+                                                          "params": {
+                                                            "slotId": "$item.id",
+                                                            "signInScreenId": "himi_sign_in"
+                                                          }
+                                                        },
+                                                        "pressFeedback": "scale",
+                                                        "haptic": "light",
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityHint": "Book this time",
+                                                        "hiddenPath": "$item.notAvailable"
                                                       }
                                                     },
                                                     {
-                                                      "id": "",
+                                                      "id": "himi_time.slot_picked",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "Text",
+                                                        "type": "HStack",
                                                         "props": {
-                                                          "text": "$item.badge",
-                                                          "style": "caption",
-                                                          "color": "warning",
-                                                          "collapseWhenEmpty": true
+                                                          "spacing": 0,
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Spacer",
+                                                                "props": {}
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "VStack",
+                                                                "props": {
+                                                                  "spacing": 0,
+                                                                  "alignment": "center",
+                                                                  "children": [
+                                                                    {
+                                                                      "id": "",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Text",
+                                                                        "props": {
+                                                                          "text": "$item.label",
+                                                                          "style": "bodyEmphasis",
+                                                                          "color": "surfacePrimary",
+                                                                          "maxLines": 1
+                                                                        }
+                                                                      }
+                                                                    },
+                                                                    {
+                                                                      "id": "",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Text",
+                                                                        "props": {
+                                                                          "text": "$item.badge",
+                                                                          "style": "caption",
+                                                                          "color": "surfacePrimary",
+                                                                          "maxLines": 1
+                                                                        }
+                                                                      },
+                                                                      "modifiers": {
+                                                                        "hiddenPath": "$item.noBadge"
+                                                                      }
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Spacer",
+                                                                "props": {}
+                                                              }
+                                                            }
+                                                          ]
                                                         }
                                                       },
                                                       "modifiers": {
-                                                        "hiddenPath": "$item.badgeNeutral"
+                                                        "fillMaxWidth": true,
+                                                        "padding": {
+                                                          "top": 11,
+                                                          "bottom": 11,
+                                                          "leading": 8,
+                                                          "trailing": 8
+                                                        },
+                                                        "cornerRadius": 22,
+                                                        "border": {
+                                                          "width": 1,
+                                                          "color": {
+                                                            "token": "textPrimary"
+                                                          }
+                                                        },
+                                                        "background": {
+                                                          "token": "textPrimary"
+                                                        },
+                                                        "accessibilityLabel": "$item.a11y",
+                                                        "onTap": {
+                                                          "actionId": "tier5.himiBookingTime.pickSlot",
+                                                          "params": {
+                                                            "slotId": "$item.id",
+                                                            "signInScreenId": "himi_sign_in"
+                                                          }
+                                                        },
+                                                        "pressFeedback": "scale",
+                                                        "haptic": "light",
+                                                        "accessibilityRole": "button",
+                                                        "accessibilityHint": "Book this time",
+                                                        "hiddenPath": "$item.notPicked"
                                                       }
                                                     },
                                                     {
-                                                      "id": "",
+                                                      "id": "himi_time.slot_unavailable",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "Text",
+                                                        "type": "HStack",
                                                         "props": {
-                                                          "text": "$item.badge",
-                                                          "style": "caption",
-                                                          "color": "textSecondary",
-                                                          "collapseWhenEmpty": true
+                                                          "spacing": 0,
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Spacer",
+                                                                "props": {}
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "VStack",
+                                                                "props": {
+                                                                  "spacing": 0,
+                                                                  "alignment": "center",
+                                                                  "children": [
+                                                                    {
+                                                                      "id": "",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Text",
+                                                                        "props": {
+                                                                          "text": "$item.label",
+                                                                          "style": "body",
+                                                                          "color": "textTertiary",
+                                                                          "maxLines": 1
+                                                                        }
+                                                                      }
+                                                                    },
+                                                                    {
+                                                                      "id": "",
+                                                                      "body": {
+                                                                        "package": "himalaya",
+                                                                        "type": "Text",
+                                                                        "props": {
+                                                                          "text": "$item.badge",
+                                                                          "style": "caption",
+                                                                          "color": "textTertiary",
+                                                                          "maxLines": 1
+                                                                        }
+                                                                      },
+                                                                      "modifiers": {
+                                                                        "hiddenPath": "$item.noBadge"
+                                                                      }
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              }
+                                                            },
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Spacer",
+                                                                "props": {}
+                                                              }
+                                                            }
+                                                          ]
                                                         }
                                                       },
                                                       "modifiers": {
-                                                        "hiddenPath": "$item.badgeWarning"
+                                                        "fillMaxWidth": true,
+                                                        "padding": {
+                                                          "top": 11,
+                                                          "bottom": 11,
+                                                          "leading": 8,
+                                                          "trailing": 8
+                                                        },
+                                                        "cornerRadius": 22,
+                                                        "border": {
+                                                          "width": 1,
+                                                          "color": {
+                                                            "token": "border"
+                                                          }
+                                                        },
+                                                        "accessibilityLabel": "$item.a11y",
+                                                        "hiddenPath": "$item.notUnavailable"
                                                       }
                                                     }
                                                   ]
                                                 }
                                               }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Spacer",
-                                                "props": {}
-                                              }
                                             }
                                           ]
                                         }
                                       },
                                       "modifiers": {
-                                        "background": {
-                                          "token": "surfaceElevated"
-                                        },
-                                        "border": {
-                                          "width": 1,
-                                          "color": {
-                                            "token": "border"
-                                          }
-                                        },
-                                        "cornerRadius": 8,
-                                        "padding": {
-                                          "leading": 12,
-                                          "trailing": 12,
-                                          "top": 12,
-                                          "bottom": 12
-                                        },
-                                        "hiddenPath": "$item.selectable"
+                                        "fillMaxWidth": true
                                       }
                                     }
                                   ]
@@ -31095,103 +32553,139 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       },
                       "modifiers": {
+                        "fillMaxWidth": true,
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 18,
+                          "bottom": 0
+                        },
                         "hiddenPath": "$service:himiBookingTime.hideDaySlots"
                       }
                     },
                     {
-                      "id": "himi_time.day_empty",
+                      "id": "himi_time.day_empty_state",
                       "body": {
                         "package": "himalaya",
-                        "type": "Text",
+                        "type": "VStack",
                         "props": {
-                          "text": "$service:himiBookingTime.dayEmptyText",
-                          "style": "body",
-                          "color": "textSecondary",
-                          "collapseWhenEmpty": true
+                          "spacing": 22,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "himi_time.day_empty",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingTime.dayEmptyText",
+                                  "style": "bodyEmphasis",
+                                  "maxLines": 2,
+                                  "collapseWhenEmpty": true,
+                                  "textAlign": "center"
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_time.check_next",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Check Next Availability",
+                                          "style": "bodyEmphasis",
+                                          "color": "surfacePrimary",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "padding": {
+                                  "leading": 22,
+                                  "trailing": 22,
+                                  "top": 12,
+                                  "bottom": 12
+                                },
+                                "cornerRadius": 23,
+                                "background": {
+                                  "token": "textPrimary"
+                                },
+                                "onTap": {
+                                  "actionId": "tier5.himiBookingTime.checkNext"
+                                },
+                                "pressFeedback": "scale",
+                                "accessibilityRole": "button",
+                                "accessibilityLabel": "Check Next Availability"
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiBookingTime.hideDayEmpty"
+                        "fillMaxWidth": true,
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 40,
+                          "bottom": 0
+                        },
+                        "hiddenPath": "$service:himiBookingTime.hasDayTimes"
                       }
                     },
                     {
-                      "id": "",
+                      "id": "himi_time.no_upcoming",
                       "body": {
                         "package": "himalaya",
                         "type": "VStack",
                         "props": {
-                          "spacing": 12,
+                          "spacing": 22,
+                          "alignment": "center",
                           "children": [
                             {
-                              "id": "himi_time.member_card",
+                              "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Text",
                                 "props": {
-                                  "spacing": 12,
-                                  "alignment": "leading",
+                                  "text": "There are no upcoming sessions for this service. Please check out our other services or contact us.",
+                                  "style": "body",
+                                  "color": "textSecondary",
+                                  "maxLines": 4,
+                                  "textAlign": "center"
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_time.no_upcoming.cta",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
                                   "children": [
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "HStack",
+                                        "type": "Text",
                                         "props": {
-                                          "spacing": 10,
-                                          "children": [
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Icon",
-                                                "props": {
-                                                  "name": "person_fill",
-                                                  "size": 18,
-                                                  "tint": "accentPrimary"
-                                                }
-                                              },
-                                              "modifiers": {
-                                                "accessibilityRole": "decorative"
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "VStack",
-                                                "props": {
-                                                  "spacing": 2,
-                                                  "alignment": "leading",
-                                                  "children": [
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "Booking as",
-                                                          "style": "caption",
-                                                          "color": "textTertiary"
-                                                        }
-                                                      }
-                                                    },
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "Text",
-                                                        "props": {
-                                                          "text": "$service:himiBookingTime.identityLine",
-                                                          "style": "bodyEmphasis",
-                                                          "collapseWhenEmpty": true
-                                                        }
-                                                      }
-                                                    }
-                                                  ]
-                                                }
-                                              }
-                                            }
-                                          ]
+                                          "text": "Back to services",
+                                          "style": "bodyEmphasis",
+                                          "color": "surfacePrimary",
+                                          "maxLines": 1
                                         }
                                       }
                                     }
@@ -31199,25 +32693,49 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 }
                               },
                               "modifiers": {
+                                "padding": {
+                                  "leading": 22,
+                                  "trailing": 22,
+                                  "top": 12,
+                                  "bottom": 12
+                                },
+                                "cornerRadius": 23,
                                 "background": {
-                                  "token": "surfaceElevated"
+                                  "token": "textPrimary"
                                 },
-                                "border": {
-                                  "width": 1,
-                                  "color": {
-                                    "token": "border"
+                                "onTap": {
+                                  "actionId": "himi.open",
+                                  "params": {
+                                    "screenId": "himi_services"
                                   }
                                 },
-                                "cornerRadius": 8,
-                                "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 14,
-                                  "bottom": 14
-                                },
-                                "hiddenPath": "$service:himiBookingTime.notMember"
+                                "pressFeedback": "scale",
+                                "accessibilityRole": "button",
+                                "accessibilityLabel": "Back to services"
                               }
-                            },
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 40,
+                          "bottom": 0
+                        },
+                        "hiddenPath": "$service:himiBookingTime.hasUpcoming"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 12,
+                          "children": [
                             {
                               "id": "",
                               "body": {
@@ -31604,42 +33122,23 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Button",
-                                        "props": {
-                                          "title": "Refresh purchase status",
-                                          "style": "secondary",
-                                          "action": {
-                                            "actionId": "tier5.himiBookingTime.iapRefresh"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingTime.iapRetryHidden"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingTime.iapBuyHidden"
-                              }
-                            },
-                            {
-                              "id": "himi_time.book.disabled",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Choose a time first",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "disabled": true,
-                                  "action": {
-                                    "actionId": "tier5.himiBookingTime.bookSelected"
-                                  }
+                                        "props": {
+                                          "title": "Refresh purchase status",
+                                          "style": "secondary",
+                                          "action": {
+                                            "actionId": "tier5.himiBookingTime.iapRefresh"
+                                          }
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingTime.iapRetryHidden"
+                                      }
+                                    }
+                                  ]
                                 }
                               },
                               "modifiers": {
-                                "hiddenPath": "$service:himiBookingTime.hideChoosePrompt"
+                                "hiddenPath": "$service:himiBookingTime.iapBuyHidden"
                               }
                             },
                             {
@@ -31662,34 +33161,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 "hiddenPath": "$service:himiBookingTime.notBooking"
                               }
                             },
-                            {
-                              "id": "himi_time.book_sign_in",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Book selected time",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "himi.open",
-                                    "params": {
-                                      "screenId": "himi_sign_in",
-                                      "mode": "signin",
-                                      "intent": "book",
-                                      "modal": "1"
-                                    },
-                                    "presentation": "sheet"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "pressFeedback": "scale",
-                                "haptic": "medium",
-                                "hiddenPath": "$service:himiBookingTime.hideTimeSignIn"
-                              }
-                            },
                             {
                               "id": "himi_time.book_course_sign_in",
                               "body": {
@@ -31718,55 +33189,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 "hiddenPath": "$service:himiBookingTime.hideCourseSignIn"
                               }
                             },
-                            {
-                              "id": "himi_time.join_waitlist_sign_in",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Join Waitlist",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "himi.open",
-                                    "params": {
-                                      "screenId": "himi_sign_in",
-                                      "mode": "signin",
-                                      "intent": "book",
-                                      "modal": "1"
-                                    },
-                                    "presentation": "sheet"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "pressFeedback": "scale",
-                                "haptic": "medium",
-                                "hiddenPath": "$service:himiBookingTime.hideWaitlistSignIn"
-                              }
-                            },
-                            {
-                              "id": "himi_time.book",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Book selected time",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "tier5.himiBookingTime.bookSelected"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "pressFeedback": "scale",
-                                "haptic": "medium",
-                                "hiddenPath": "$service:himiBookingTime.hideTimeBook"
-                              }
-                            },
                             {
                               "id": "himi_time.book_course",
                               "body": {
@@ -31788,34 +33210,13 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 "hiddenPath": "$service:himiBookingTime.hideCourseBook"
                               }
                             },
-                            {
-                              "id": "himi_time.join_waitlist",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Join Waitlist",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "tier5.himiBookingTime.bookSelected"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "pressFeedback": "scale",
-                                "haptic": "medium",
-                                "hiddenPath": "$service:himiBookingTime.hideWaitlistBook"
-                              }
-                            },
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "$service:himiBookingTime.message",
+                                  "text": "$service:himiBookingTime.courseMessage",
                                   "style": "footnote",
                                   "color": "textSecondary",
                                   "collapseWhenEmpty": true
@@ -31823,91 +33224,23 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               }
                             },
                             {
-                              "id": "himi_time.success",
+                              "id": "himi_time.success.bookings",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Button",
                                 "props": {
-                                  "spacing": 12,
-                                  "alignment": "leading",
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "HStack",
-                                        "props": {
-                                          "spacing": 10,
-                                          "children": [
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Icon",
-                                                "props": {
-                                                  "name": "check",
-                                                  "size": 18,
-                                                  "tint": "accentPrimary"
-                                                }
-                                              },
-                                              "modifiers": {
-                                                "accessibilityRole": "decorative"
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$service:himiBookingTime.successMessage",
-                                                  "style": "bodyEmphasis",
-                                                  "collapseWhenEmpty": true
-                                                }
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.success.bookings",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "View My Bookings",
-                                          "style": "secondary",
-                                          "fullWidth": true,
-                                          "action": {
-                                            "actionId": "himi.open",
-                                            "params": {
-                                              "screenId": "himi_bookings"
-                                            }
-                                          }
-                                        }
-                                      }
+                                  "title": "View My Bookings",
+                                  "style": "secondary",
+                                  "fullWidth": true,
+                                  "action": {
+                                    "actionId": "himi.open",
+                                    "params": {
+                                      "screenId": "himi_bookings"
                                     }
-                                  ]
+                                  }
                                 }
                               },
                               "modifiers": {
-                                "background": {
-                                  "token": "surfaceElevated"
-                                },
-                                "border": {
-                                  "width": 1,
-                                  "color": {
-                                    "token": "border"
-                                  }
-                                },
-                                "cornerRadius": 8,
-                                "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 14,
-                                  "bottom": 14
-                                },
                                 "hiddenPath": "$service:himiBookingTime.noSuccess"
                               }
                             }
@@ -31915,7 +33248,13 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiBookingTime.isLoading"
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 18,
+                          "bottom": 0
+                        },
+                        "hiddenPath": "$service:himiBookingTime.notCourse"
                       }
                     }
                   ]
@@ -31924,77 +33263,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
               "modifiers": {
                 "hiddenPath": "$service:himiBookingTime.isLoading"
               }
-            },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "VStack",
-                "props": {
-                  "spacing": 12,
-                  "alignment": "center",
-                  "children": [
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Icon",
-                        "props": {
-                          "name": "calendar",
-                          "size": 34,
-                          "tint": "textTertiary"
-                        }
-                      },
-                      "modifiers": {
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiBookingTime.emptyText",
-                          "style": "bodyEmphasis",
-                          "color": "textSecondary",
-                          "collapseWhenEmpty": true
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_time.empty.cta",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Back to services",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "himi.open",
-                            "params": {
-                              "screenId": "himi_services"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 24,
-                  "trailing": 24,
-                  "top": 24,
-                  "bottom": 24
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
-                },
-                "hiddenPath": "$service:himiBookingTime.noEmpty"
-              }
             }
           ]
         }
@@ -32004,9 +33272,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 16,
-          "trailing": 16,
-          "top": 18,
+          "leading": 0,
+          "trailing": 0,
+          "top": 0,
           "bottom": 24
         },
         "onAppear": {