@nok-integration/storefront-react 0.17.1 → 0.18.0

package/dist/index.mjs

@@ -483,18 +483,18 @@ function requireParseUtil() {
         if (this.value !== "aborted")
           this.value = "aborted";
       }
-      static mergeArray(status2, results) {
+      static mergeArray(status, results) {
         const arrayValue = [];
         for (const s of results) {
           if (s.status === "aborted")
             return exports.INVALID;
           if (s.status === "dirty")
-            status2.dirty();
+            status.dirty();
           arrayValue.push(s.value);
         }
-        return { status: status2.value, value: arrayValue };
+        return { status: status.value, value: arrayValue };
       }
-      static async mergeObjectAsync(status2, pairs) {
+      static async mergeObjectAsync(status, pairs) {
         const syncPairs = [];
         for (const pair of pairs) {
           const key = await pair.key;
@@ -504,9 +504,9 @@ function requireParseUtil() {
             value: value2
           });
         }
-        return ParseStatus.mergeObjectSync(status2, syncPairs);
+        return ParseStatus.mergeObjectSync(status, syncPairs);
       }
-      static mergeObjectSync(status2, pairs) {
+      static mergeObjectSync(status, pairs) {
         const finalObject = {};
         for (const pair of pairs) {
           const { key, value: value2 } = pair;
@@ -515,14 +515,14 @@ function requireParseUtil() {
           if (value2.status === "aborted")
             return exports.INVALID;
           if (key.status === "dirty")
-            status2.dirty();
+            status.dirty();
           if (value2.status === "dirty")
-            status2.dirty();
+            status.dirty();
           if (key.value !== "__proto__" && (typeof value2.value !== "undefined" || pair.alwaysSet)) {
             finalObject[key.value] = value2.value;
           }
         }
-        return { status: status2.value, value: finalObject };
+        return { status: status.value, value: finalObject };
       }
     }
     exports.ParseStatus = ParseStatus;
@@ -764,7 +764,7 @@ function requireTypes() {
       const result = await ((0, parseUtil_js_1.isAsync)(maybeAsyncResult) ? maybeAsyncResult : Promise.resolve(maybeAsyncResult));
       return handleResult(ctx, result);
     }
-    refine(check, message2) {
+    refine(check2, message2) {
       const getIssueProperties = (val) => {
         if (typeof message2 === "string" || typeof message2 === "undefined") {
           return { message: message2 };
@@ -775,7 +775,7 @@ function requireTypes() {
         }
       };
       return this._refinement((val, ctx) => {
-        const result = check(val);
+        const result = check2(val);
         const setError = () => ctx.addIssue({
           code: ZodError_js_1.ZodIssueCode.custom,
           ...getIssueProperties(val)
@@ -798,9 +798,9 @@ function requireTypes() {
         }
       });
     }
-    refinement(check, refinementData) {
+    refinement(check2, refinementData) {
       return this._refinement((val, ctx) => {
-        if (!check(val)) {
+        if (!check2(val)) {
           ctx.addIssue(typeof refinementData === "function" ? refinementData(val, ctx) : refinementData);
           return false;
         } else {
@@ -1023,72 +1023,72 @@ function requireTypes() {
         });
         return parseUtil_js_1.INVALID;
       }
-      const status2 = new parseUtil_js_1.ParseStatus();
+      const status = new parseUtil_js_1.ParseStatus();
       let ctx = void 0;
-      for (const check of this._def.checks) {
-        if (check.kind === "min") {
-          if (input.data.length < check.value) {
+      for (const check2 of this._def.checks) {
+        if (check2.kind === "min") {
+          if (input.data.length < check2.value) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_small,
-              minimum: check.value,
+              minimum: check2.value,
               type: "string",
               inclusive: true,
               exact: false,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "max") {
-          if (input.data.length > check.value) {
+        } else if (check2.kind === "max") {
+          if (input.data.length > check2.value) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_big,
-              maximum: check.value,
+              maximum: check2.value,
               type: "string",
               inclusive: true,
               exact: false,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "length") {
-          const tooBig = input.data.length > check.value;
-          const tooSmall = input.data.length < check.value;
+        } else if (check2.kind === "length") {
+          const tooBig = input.data.length > check2.value;
+          const tooSmall = input.data.length < check2.value;
           if (tooBig || tooSmall) {
             ctx = this._getOrReturnCtx(input, ctx);
             if (tooBig) {
               (0, parseUtil_js_1.addIssueToContext)(ctx, {
                 code: ZodError_js_1.ZodIssueCode.too_big,
-                maximum: check.value,
+                maximum: check2.value,
                 type: "string",
                 inclusive: true,
                 exact: true,
-                message: check.message
+                message: check2.message
               });
             } else if (tooSmall) {
               (0, parseUtil_js_1.addIssueToContext)(ctx, {
                 code: ZodError_js_1.ZodIssueCode.too_small,
-                minimum: check.value,
+                minimum: check2.value,
                 type: "string",
                 inclusive: true,
                 exact: true,
-                message: check.message
+                message: check2.message
               });
             }
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "email") {
+        } else if (check2.kind === "email") {
           if (!emailRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "email",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "emoji") {
+        } else if (check2.kind === "emoji") {
           if (!emojiRegex) {
             emojiRegex = new RegExp(_emojiRegex, "u");
           }
@@ -1097,61 +1097,61 @@ function requireTypes() {
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "emoji",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "uuid") {
+        } else if (check2.kind === "uuid") {
           if (!uuidRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "uuid",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "nanoid") {
+        } else if (check2.kind === "nanoid") {
           if (!nanoidRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "nanoid",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "cuid") {
+        } else if (check2.kind === "cuid") {
           if (!cuidRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "cuid",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "cuid2") {
+        } else if (check2.kind === "cuid2") {
           if (!cuid2Regex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "cuid2",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "ulid") {
+        } else if (check2.kind === "ulid") {
           if (!ulidRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "ulid",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "url") {
+        } else if (check2.kind === "url") {
           try {
             new URL(input.data);
           } catch {
@@ -1159,156 +1159,156 @@ function requireTypes() {
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "url",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "regex") {
-          check.regex.lastIndex = 0;
-          const testResult = check.regex.test(input.data);
+        } else if (check2.kind === "regex") {
+          check2.regex.lastIndex = 0;
+          const testResult = check2.regex.test(input.data);
           if (!testResult) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "regex",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "trim") {
+        } else if (check2.kind === "trim") {
           input.data = input.data.trim();
-        } else if (check.kind === "includes") {
-          if (!input.data.includes(check.value, check.position)) {
+        } else if (check2.kind === "includes") {
+          if (!input.data.includes(check2.value, check2.position)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              validation: { includes: check.value, position: check.position },
-              message: check.message
+              validation: { includes: check2.value, position: check2.position },
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "toLowerCase") {
+        } else if (check2.kind === "toLowerCase") {
           input.data = input.data.toLowerCase();
-        } else if (check.kind === "toUpperCase") {
+        } else if (check2.kind === "toUpperCase") {
           input.data = input.data.toUpperCase();
-        } else if (check.kind === "startsWith") {
-          if (!input.data.startsWith(check.value)) {
+        } else if (check2.kind === "startsWith") {
+          if (!input.data.startsWith(check2.value)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              validation: { startsWith: check.value },
-              message: check.message
+              validation: { startsWith: check2.value },
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "endsWith") {
-          if (!input.data.endsWith(check.value)) {
+        } else if (check2.kind === "endsWith") {
+          if (!input.data.endsWith(check2.value)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              validation: { endsWith: check.value },
-              message: check.message
+              validation: { endsWith: check2.value },
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "datetime") {
-          const regex = datetimeRegex(check);
+        } else if (check2.kind === "datetime") {
+          const regex = datetimeRegex(check2);
           if (!regex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_string,
               validation: "datetime",
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "date") {
+        } else if (check2.kind === "date") {
           const regex = dateRegex;
           if (!regex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_string,
               validation: "date",
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "time") {
-          const regex = timeRegex(check);
+        } else if (check2.kind === "time") {
+          const regex = timeRegex(check2);
           if (!regex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_string,
               validation: "time",
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "duration") {
+        } else if (check2.kind === "duration") {
           if (!durationRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "duration",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "ip") {
-          if (!isValidIP(input.data, check.version)) {
+        } else if (check2.kind === "ip") {
+          if (!isValidIP(input.data, check2.version)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "ip",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "jwt") {
-          if (!isValidJWT(input.data, check.alg)) {
+        } else if (check2.kind === "jwt") {
+          if (!isValidJWT(input.data, check2.alg)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "jwt",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "cidr") {
-          if (!isValidCidr(input.data, check.version)) {
+        } else if (check2.kind === "cidr") {
+          if (!isValidCidr(input.data, check2.version)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "cidr",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "base64") {
+        } else if (check2.kind === "base64") {
           if (!base64Regex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "base64",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "base64url") {
+        } else if (check2.kind === "base64url") {
           if (!base64urlRegex.test(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               validation: "base64url",
               code: ZodError_js_1.ZodIssueCode.invalid_string,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
         } else {
-          util_js_1.util.assertNever(check);
+          util_js_1.util.assertNever(check2);
         }
       }
-      return { status: status2.value, value: input.data };
+      return { status: status.value, value: input.data };
     }
     _regex(regex, validation, message2) {
       return this.refinement((data) => regex.test(data), {
@@ -1317,10 +1317,10 @@ function requireTypes() {
         ...errorUtil_js_1.errorUtil.errToObj(message2)
       });
     }
-    _addCheck(check) {
+    _addCheck(check2) {
       return new ZodString({
         ...this._def,
-        checks: [...this._def.checks, check]
+        checks: [...this._def.checks, check2]
       });
     }
     email(message2) {
@@ -1555,12 +1555,12 @@ function requireTypes() {
       ...processCreateParams(params)
     });
   };
-  function floatSafeRemainder(val, step) {
+  function floatSafeRemainder(val, step3) {
     const valDecCount = (val.toString().split(".")[1] || "").length;
-    const stepDecCount = (step.toString().split(".")[1] || "").length;
+    const stepDecCount = (step3.toString().split(".")[1] || "").length;
     const decCount = valDecCount > stepDecCount ? valDecCount : stepDecCount;
     const valInt = Number.parseInt(val.toFixed(decCount).replace(".", ""));
-    const stepInt = Number.parseInt(step.toFixed(decCount).replace(".", ""));
+    const stepInt = Number.parseInt(step3.toFixed(decCount).replace(".", ""));
     return valInt % stepInt / 10 ** decCount;
   }
   class ZodNumber extends ZodType {
@@ -1585,71 +1585,71 @@ function requireTypes() {
         return parseUtil_js_1.INVALID;
       }
       let ctx = void 0;
-      const status2 = new parseUtil_js_1.ParseStatus();
-      for (const check of this._def.checks) {
-        if (check.kind === "int") {
+      const status = new parseUtil_js_1.ParseStatus();
+      for (const check2 of this._def.checks) {
+        if (check2.kind === "int") {
           if (!util_js_1.util.isInteger(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.invalid_type,
               expected: "integer",
               received: "float",
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "min") {
-          const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
+        } else if (check2.kind === "min") {
+          const tooSmall = check2.inclusive ? input.data < check2.value : input.data <= check2.value;
           if (tooSmall) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_small,
-              minimum: check.value,
+              minimum: check2.value,
               type: "number",
-              inclusive: check.inclusive,
+              inclusive: check2.inclusive,
               exact: false,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "max") {
-          const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
+        } else if (check2.kind === "max") {
+          const tooBig = check2.inclusive ? input.data > check2.value : input.data >= check2.value;
           if (tooBig) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_big,
-              maximum: check.value,
+              maximum: check2.value,
               type: "number",
-              inclusive: check.inclusive,
+              inclusive: check2.inclusive,
               exact: false,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "multipleOf") {
-          if (floatSafeRemainder(input.data, check.value) !== 0) {
+        } else if (check2.kind === "multipleOf") {
+          if (floatSafeRemainder(input.data, check2.value) !== 0) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.not_multiple_of,
-              multipleOf: check.value,
-              message: check.message
+              multipleOf: check2.value,
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "finite") {
+        } else if (check2.kind === "finite") {
           if (!Number.isFinite(input.data)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.not_finite,
-              message: check.message
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
         } else {
-          util_js_1.util.assertNever(check);
+          util_js_1.util.assertNever(check2);
         }
       }
-      return { status: status2.value, value: input.data };
+      return { status: status.value, value: input.data };
     }
     gte(value2, message2) {
       return this.setLimit("min", value2, true, errorUtil_js_1.errorUtil.toString(message2));
@@ -1677,10 +1677,10 @@ function requireTypes() {
         ]
       });
     }
-    _addCheck(check) {
+    _addCheck(check2) {
       return new ZodNumber({
         ...this._def,
-        checks: [...this._def.checks, check]
+        checks: [...this._def.checks, check2]
       });
     }
     int(message2) {
@@ -1815,49 +1815,49 @@ function requireTypes() {
         return this._getInvalidInput(input);
       }
       let ctx = void 0;
-      const status2 = new parseUtil_js_1.ParseStatus();
-      for (const check of this._def.checks) {
-        if (check.kind === "min") {
-          const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
+      const status = new parseUtil_js_1.ParseStatus();
+      for (const check2 of this._def.checks) {
+        if (check2.kind === "min") {
+          const tooSmall = check2.inclusive ? input.data < check2.value : input.data <= check2.value;
           if (tooSmall) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_small,
               type: "bigint",
-              minimum: check.value,
-              inclusive: check.inclusive,
-              message: check.message
+              minimum: check2.value,
+              inclusive: check2.inclusive,
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "max") {
-          const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
+        } else if (check2.kind === "max") {
+          const tooBig = check2.inclusive ? input.data > check2.value : input.data >= check2.value;
           if (tooBig) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_big,
               type: "bigint",
-              maximum: check.value,
-              inclusive: check.inclusive,
-              message: check.message
+              maximum: check2.value,
+              inclusive: check2.inclusive,
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "multipleOf") {
-          if (input.data % check.value !== BigInt(0)) {
+        } else if (check2.kind === "multipleOf") {
+          if (input.data % check2.value !== BigInt(0)) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.not_multiple_of,
-              multipleOf: check.value,
-              message: check.message
+              multipleOf: check2.value,
+              message: check2.message
             });
-            status2.dirty();
+            status.dirty();
           }
         } else {
-          util_js_1.util.assertNever(check);
+          util_js_1.util.assertNever(check2);
         }
       }
-      return { status: status2.value, value: input.data };
+      return { status: status.value, value: input.data };
     }
     _getInvalidInput(input) {
       const ctx = this._getOrReturnCtx(input);
@@ -1894,10 +1894,10 @@ function requireTypes() {
         ]
       });
     }
-    _addCheck(check) {
+    _addCheck(check2) {
       return new ZodBigInt({
         ...this._def,
-        checks: [...this._def.checks, check]
+        checks: [...this._def.checks, check2]
       });
     }
     positive(message2) {
@@ -2017,48 +2017,48 @@ function requireTypes() {
         });
         return parseUtil_js_1.INVALID;
       }
-      const status2 = new parseUtil_js_1.ParseStatus();
+      const status = new parseUtil_js_1.ParseStatus();
       let ctx = void 0;
-      for (const check of this._def.checks) {
-        if (check.kind === "min") {
-          if (input.data.getTime() < check.value) {
+      for (const check2 of this._def.checks) {
+        if (check2.kind === "min") {
+          if (input.data.getTime() < check2.value) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_small,
-              message: check.message,
+              message: check2.message,
               inclusive: true,
               exact: false,
-              minimum: check.value,
+              minimum: check2.value,
               type: "date"
             });
-            status2.dirty();
+            status.dirty();
           }
-        } else if (check.kind === "max") {
-          if (input.data.getTime() > check.value) {
+        } else if (check2.kind === "max") {
+          if (input.data.getTime() > check2.value) {
             ctx = this._getOrReturnCtx(input, ctx);
             (0, parseUtil_js_1.addIssueToContext)(ctx, {
               code: ZodError_js_1.ZodIssueCode.too_big,
-              message: check.message,
+              message: check2.message,
               inclusive: true,
               exact: false,
-              maximum: check.value,
+              maximum: check2.value,
               type: "date"
             });
-            status2.dirty();
+            status.dirty();
           }
         } else {
-          util_js_1.util.assertNever(check);
+          util_js_1.util.assertNever(check2);
         }
       }
       return {
-        status: status2.value,
+        status: status.value,
         value: new Date(input.data.getTime())
       };
     }
-    _addCheck(check) {
+    _addCheck(check2) {
       return new ZodDate({
         ...this._def,
-        checks: [...this._def.checks, check]
+        checks: [...this._def.checks, check2]
       });
     }
     min(minDate, message2) {
@@ -2245,7 +2245,7 @@ function requireTypes() {
   };
   class ZodArray extends ZodType {
     _parse(input) {
-      const { ctx, status: status2 } = this._processInputParams(input);
+      const { ctx, status } = this._processInputParams(input);
       const def = this._def;
       if (ctx.parsedType !== util_js_1.ZodParsedType.array) {
         (0, parseUtil_js_1.addIssueToContext)(ctx, {
@@ -2268,7 +2268,7 @@ function requireTypes() {
             exact: true,
             message: def.exactLength.message
           });
-          status2.dirty();
+          status.dirty();
         }
       }
       if (def.minLength !== null) {
@@ -2281,7 +2281,7 @@ function requireTypes() {
             exact: false,
             message: def.minLength.message
           });
-          status2.dirty();
+          status.dirty();
         }
       }
       if (def.maxLength !== null) {
@@ -2294,20 +2294,20 @@ function requireTypes() {
             exact: false,
             message: def.maxLength.message
           });
-          status2.dirty();
+          status.dirty();
         }
       }
       if (ctx.common.async) {
         return Promise.all([...ctx.data].map((item2, i) => {
           return def.type._parseAsync(new ParseInputLazyPath(ctx, item2, ctx.path, i));
         })).then((result2) => {
-          return parseUtil_js_1.ParseStatus.mergeArray(status2, result2);
+          return parseUtil_js_1.ParseStatus.mergeArray(status, result2);
         });
       }
       const result = [...ctx.data].map((item2, i) => {
         return def.type._parseSync(new ParseInputLazyPath(ctx, item2, ctx.path, i));
       });
-      return parseUtil_js_1.ParseStatus.mergeArray(status2, result);
+      return parseUtil_js_1.ParseStatus.mergeArray(status, result);
     }
     get element() {
       return this._def.type;
@@ -2397,7 +2397,7 @@ function requireTypes() {
         });
         return parseUtil_js_1.INVALID;
       }
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       const { shape, keys: shapeKeys } = this._getCached();
       const extraKeys = [];
       if (!(this._def.catchall instanceof ZodNever && this._def.unknownKeys === "strip")) {
@@ -2432,7 +2432,7 @@ function requireTypes() {
               code: ZodError_js_1.ZodIssueCode.unrecognized_keys,
               keys: extraKeys
             });
-            status2.dirty();
+            status.dirty();
           }
         } else if (unknownKeys === "strip") ;
         else {
@@ -2466,10 +2466,10 @@ function requireTypes() {
           }
           return syncPairs;
         }).then((syncPairs) => {
-          return parseUtil_js_1.ParseStatus.mergeObjectSync(status2, syncPairs);
+          return parseUtil_js_1.ParseStatus.mergeObjectSync(status, syncPairs);
         });
       } else {
-        return parseUtil_js_1.ParseStatus.mergeObjectSync(status2, pairs);
+        return parseUtil_js_1.ParseStatus.mergeObjectSync(status, pairs);
       }
     }
     get shape() {
@@ -2950,7 +2950,7 @@ function requireTypes() {
   }
   class ZodIntersection extends ZodType {
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       const handleParsed = (parsedLeft, parsedRight) => {
         if ((0, parseUtil_js_1.isAborted)(parsedLeft) || (0, parseUtil_js_1.isAborted)(parsedRight)) {
           return parseUtil_js_1.INVALID;
@@ -2963,9 +2963,9 @@ function requireTypes() {
           return parseUtil_js_1.INVALID;
         }
         if ((0, parseUtil_js_1.isDirty)(parsedLeft) || (0, parseUtil_js_1.isDirty)(parsedRight)) {
-          status2.dirty();
+          status.dirty();
         }
-        return { status: status2.value, value: merged.data };
+        return { status: status.value, value: merged.data };
       };
       if (ctx.common.async) {
         return Promise.all([
@@ -3004,7 +3004,7 @@ function requireTypes() {
   };
   class ZodTuple extends ZodType {
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       if (ctx.parsedType !== util_js_1.ZodParsedType.array) {
         (0, parseUtil_js_1.addIssueToContext)(ctx, {
           code: ZodError_js_1.ZodIssueCode.invalid_type,
@@ -3032,7 +3032,7 @@ function requireTypes() {
           exact: false,
           type: "array"
         });
-        status2.dirty();
+        status.dirty();
       }
       const items2 = [...ctx.data].map((item2, itemIndex) => {
         const schema = this._def.items[itemIndex] || this._def.rest;
@@ -3042,10 +3042,10 @@ function requireTypes() {
       }).filter((x) => !!x);
       if (ctx.common.async) {
         return Promise.all(items2).then((results) => {
-          return parseUtil_js_1.ParseStatus.mergeArray(status2, results);
+          return parseUtil_js_1.ParseStatus.mergeArray(status, results);
         });
       } else {
-        return parseUtil_js_1.ParseStatus.mergeArray(status2, items2);
+        return parseUtil_js_1.ParseStatus.mergeArray(status, items2);
       }
     }
     get items() {
@@ -3078,7 +3078,7 @@ function requireTypes() {
       return this._def.valueType;
     }
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       if (ctx.parsedType !== util_js_1.ZodParsedType.object) {
         (0, parseUtil_js_1.addIssueToContext)(ctx, {
           code: ZodError_js_1.ZodIssueCode.invalid_type,
@@ -3098,9 +3098,9 @@ function requireTypes() {
         });
       }
       if (ctx.common.async) {
-        return parseUtil_js_1.ParseStatus.mergeObjectAsync(status2, pairs);
+        return parseUtil_js_1.ParseStatus.mergeObjectAsync(status, pairs);
       } else {
-        return parseUtil_js_1.ParseStatus.mergeObjectSync(status2, pairs);
+        return parseUtil_js_1.ParseStatus.mergeObjectSync(status, pairs);
       }
     }
     get element() {
@@ -3132,7 +3132,7 @@ function requireTypes() {
       return this._def.valueType;
     }
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       if (ctx.parsedType !== util_js_1.ZodParsedType.map) {
         (0, parseUtil_js_1.addIssueToContext)(ctx, {
           code: ZodError_js_1.ZodIssueCode.invalid_type,
@@ -3159,11 +3159,11 @@ function requireTypes() {
               return parseUtil_js_1.INVALID;
             }
             if (key.status === "dirty" || value2.status === "dirty") {
-              status2.dirty();
+              status.dirty();
             }
             finalMap.set(key.value, value2.value);
           }
-          return { status: status2.value, value: finalMap };
+          return { status: status.value, value: finalMap };
         });
       } else {
         const finalMap = /* @__PURE__ */ new Map();
@@ -3174,11 +3174,11 @@ function requireTypes() {
             return parseUtil_js_1.INVALID;
           }
           if (key.status === "dirty" || value2.status === "dirty") {
-            status2.dirty();
+            status.dirty();
           }
           finalMap.set(key.value, value2.value);
         }
-        return { status: status2.value, value: finalMap };
+        return { status: status.value, value: finalMap };
       }
     }
   }
@@ -3193,7 +3193,7 @@ function requireTypes() {
   };
   class ZodSet extends ZodType {
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       if (ctx.parsedType !== util_js_1.ZodParsedType.set) {
         (0, parseUtil_js_1.addIssueToContext)(ctx, {
           code: ZodError_js_1.ZodIssueCode.invalid_type,
@@ -3213,7 +3213,7 @@ function requireTypes() {
             exact: false,
             message: def.minSize.message
           });
-          status2.dirty();
+          status.dirty();
         }
       }
       if (def.maxSize !== null) {
@@ -3226,7 +3226,7 @@ function requireTypes() {
             exact: false,
             message: def.maxSize.message
           });
-          status2.dirty();
+          status.dirty();
         }
       }
       const valueType = this._def.valueType;
@@ -3236,10 +3236,10 @@ function requireTypes() {
           if (element.status === "aborted")
             return parseUtil_js_1.INVALID;
           if (element.status === "dirty")
-            status2.dirty();
+            status.dirty();
           parsedSet.add(element.value);
         }
-        return { status: status2.value, value: parsedSet };
+        return { status: status.value, value: parsedSet };
       }
       const elements = [...ctx.data.values()].map((item2, i) => valueType._parse(new ParseInputLazyPath(ctx, item2, ctx.path, i)));
       if (ctx.common.async) {
@@ -3577,15 +3577,15 @@ function requireTypes() {
       return this._def.schema._def.typeName === ZodFirstPartyTypeKind.ZodEffects ? this._def.schema.sourceType() : this._def.schema;
     }
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       const effect = this._def.effect || null;
       const checkCtx = {
         addIssue: (arg) => {
           (0, parseUtil_js_1.addIssueToContext)(ctx, arg);
           if (arg.fatal) {
-            status2.abort();
+            status.abort();
           } else {
-            status2.dirty();
+            status.dirty();
           }
         },
         get path() {
@@ -3597,7 +3597,7 @@ function requireTypes() {
         const processed = effect.transform(ctx.data, checkCtx);
         if (ctx.common.async) {
           return Promise.resolve(processed).then(async (processed2) => {
-            if (status2.value === "aborted")
+            if (status.value === "aborted")
               return parseUtil_js_1.INVALID;
             const result = await this._def.schema._parseAsync({
               data: processed2,
@@ -3608,12 +3608,12 @@ function requireTypes() {
               return parseUtil_js_1.INVALID;
             if (result.status === "dirty")
               return (0, parseUtil_js_1.DIRTY)(result.value);
-            if (status2.value === "dirty")
+            if (status.value === "dirty")
               return (0, parseUtil_js_1.DIRTY)(result.value);
             return result;
           });
         } else {
-          if (status2.value === "aborted")
+          if (status.value === "aborted")
             return parseUtil_js_1.INVALID;
           const result = this._def.schema._parseSync({
             data: processed,
@@ -3624,7 +3624,7 @@ function requireTypes() {
             return parseUtil_js_1.INVALID;
           if (result.status === "dirty")
             return (0, parseUtil_js_1.DIRTY)(result.value);
-          if (status2.value === "dirty")
+          if (status.value === "dirty")
             return (0, parseUtil_js_1.DIRTY)(result.value);
           return result;
         }
@@ -3649,17 +3649,17 @@ function requireTypes() {
           if (inner2.status === "aborted")
             return parseUtil_js_1.INVALID;
           if (inner2.status === "dirty")
-            status2.dirty();
+            status.dirty();
           executeRefinement(inner2.value);
-          return { status: status2.value, value: inner2.value };
+          return { status: status.value, value: inner2.value };
         } else {
           return this._def.schema._parseAsync({ data: ctx.data, path: ctx.path, parent: ctx }).then((inner2) => {
             if (inner2.status === "aborted")
               return parseUtil_js_1.INVALID;
             if (inner2.status === "dirty")
-              status2.dirty();
+              status.dirty();
             return executeRefinement(inner2.value).then(() => {
-              return { status: status2.value, value: inner2.value };
+              return { status: status.value, value: inner2.value };
             });
           });
         }
@@ -3677,13 +3677,13 @@ function requireTypes() {
           if (result instanceof Promise) {
             throw new Error(`Asynchronous transform encountered during synchronous parse operation. Use .parseAsync instead.`);
           }
-          return { status: status2.value, value: result };
+          return { status: status.value, value: result };
         } else {
           return this._def.schema._parseAsync({ data: ctx.data, path: ctx.path, parent: ctx }).then((base) => {
             if (!(0, parseUtil_js_1.isValid)(base))
               return parseUtil_js_1.INVALID;
             return Promise.resolve(effect.transform(base.value, checkCtx)).then((result) => ({
-              status: status2.value,
+              status: status.value,
               value: result
             }));
           });
@@ -3870,7 +3870,7 @@ function requireTypes() {
   types.ZodBranded = ZodBranded;
   class ZodPipeline extends ZodType {
     _parse(input) {
-      const { status: status2, ctx } = this._processInputParams(input);
+      const { status, ctx } = this._processInputParams(input);
       if (ctx.common.async) {
         const handleAsync = async () => {
           const inResult = await this._def.in._parseAsync({
@@ -3881,7 +3881,7 @@ function requireTypes() {
           if (inResult.status === "aborted")
             return parseUtil_js_1.INVALID;
           if (inResult.status === "dirty") {
-            status2.dirty();
+            status.dirty();
             return (0, parseUtil_js_1.DIRTY)(inResult.value);
           } else {
             return this._def.out._parseAsync({
@@ -3901,7 +3901,7 @@ function requireTypes() {
         if (inResult.status === "aborted")
           return parseUtil_js_1.INVALID;
         if (inResult.status === "dirty") {
-          status2.dirty();
+          status.dirty();
           return {
             status: "dirty",
             value: inResult.value
@@ -3952,10 +3952,10 @@ function requireTypes() {
     const p2 = typeof p === "string" ? { message: p } : p;
     return p2;
   }
-  function custom(check, _params = {}, fatal) {
-    if (check)
+  function custom(check2, _params = {}, fatal) {
+    if (check2)
       return ZodAny.create().superRefine((data, ctx) => {
-        const r = check(data);
+        const r = check2(data);
         if (r instanceof Promise) {
           return r.then((r2) => {
             if (!r2) {
@@ -4252,7 +4252,7 @@ function requireCatalog() {
   hasRequiredCatalog = 1;
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.CatalogReadQuery = exports.ListProductsQuery = exports.RecommendationsResponse = exports.ProductListResponse = exports.Product = exports.SizeGuide = exports.ProductPromo = exports.ProductVariant = void 0;
+    exports.CatalogReadQuery = exports.ListProductsQuery = exports.RecommendationsResponse = exports.ProductListResponse = exports.Product = exports.SizeGuide = exports.SizeGuideMeasurement = exports.SizeChartUnit = exports.ProductPromo = exports.ProductVariant = void 0;
     const zod_1 = /* @__PURE__ */ requireZod();
     const money_1 = requireMoney();
     const common_1 = requireCommon();
@@ -4276,12 +4276,40 @@ function requireCatalog() {
       /** ISO-8601 end time that drives the countdown; absent = show the message, no timer. */
       ends_at: common_1.Timestamp.optional()
     });
+    exports.SizeChartUnit = zod_1.z.enum(["cm", "in"]);
+    exports.SizeGuideMeasurement = zod_1.z.object({
+      /** e.g. "Chest width". */
+      label: zod_1.z.string().min(1),
+      /** e.g. "Measured 2.5 cm below the armhole, garment flat." */
+      description: zod_1.z.string().min(1)
+    });
     exports.SizeGuide = zod_1.z.object({
       title: zod_1.z.string(),
-      /** Column headings for `rows`, e.g. `['Size', 'Chest (cm)', 'Length (cm)']`. */
+      /** The fit this chart is for, e.g. "Oversized hoodies and zip-ups · Unisex". */
+      subtitle: zod_1.z.string().min(1).optional(),
+      /**
+       * Column headings for `rows`, e.g. `['Size', 'Chest', 'Length']`.
+       *
+       * Bare nouns, with no unit in the heading: the unit belongs to the whole chart and is
+       * named by `unit`, so that a consumer converting to the other unit does not leave
+       * "Chest (cm)" written above a column of inches.
+       */
       columns: zod_1.z.array(zod_1.z.string()).optional(),
       /** One row per size; each row's length matches `columns`. */
       rows: zod_1.z.array(zod_1.z.array(zod_1.z.string())).optional(),
+      /**
+       * The unit `rows` are written in.
+       *
+       * Absent means the numbers carry no declared unit — a consumer must then show them as
+       * they are and offer no conversion, because it has nothing to convert from.
+       */
+      unit: exports.SizeChartUnit.optional(),
+      /** The line under the table, e.g. "All measurements are taken from the garment laid flat, not from the body." */
+      note: zod_1.z.string().min(1).optional(),
+      /** The "How to measure" list. Absent/empty = the section is not drawn. */
+      measurements: zod_1.z.array(exports.SizeGuideMeasurement).optional(),
+      /** The fabric line, e.g. "100% cotton · 220–240 GSM · Oversized fit · Sizes XS–XL". */
+      fabric: zod_1.z.string().min(1).optional(),
       /** Free-text fit guidance, e.g. "Relaxed, slightly oversized fit". */
       notes: zod_1.z.array(zod_1.z.string()).optional()
     });
@@ -4336,7 +4364,7 @@ function requireContent() {
   hasRequiredContent = 1;
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.HomeContent = exports.HomeSlide = exports.CategoryPage = exports.CategoryBlock = exports.ExploreBlock = exports.WhyUsBlock = exports.ReviewBlock = exports.GridBlock = exports.LifestyleImageBlock = exports.FeaturedBlock = exports.LifestyleTextBlock = exports.RailBlock = exports.CategoryHero = void 0;
+    exports.HomeContent = exports.HomeSlide = exports.CategoryPage = exports.CategoryBlock = exports.ProductGalleryBlock = exports.ExploreBlock = exports.WhyUsBlock = exports.ReviewBlock = exports.GridBlock = exports.LifestyleImageBlock = exports.FeaturedBlock = exports.LifestyleTextBlock = exports.RailBlock = exports.CategoryHero = void 0;
     const zod_1 = /* @__PURE__ */ requireZod();
     const common_1 = requireCommon();
     const catalog_1 = requireCatalog();
@@ -4366,7 +4394,7 @@ function requireContent() {
     });
     exports.GridBlock = zod_1.z.object({
       kind: zod_1.z.literal("grid"),
-      title: zod_1.z.string(),
+      title: zod_1.z.string().min(1).optional(),
       products: zod_1.z.array(catalog_1.Product)
     });
     exports.ReviewBlock = zod_1.z.object({
@@ -4387,10 +4415,16 @@ function requireContent() {
       title: zod_1.z.string(),
       links: zod_1.z.array(zod_1.z.object({ label: zod_1.z.string(), code: zod_1.z.string() })).min(1)
     });
+    exports.ProductGalleryBlock = zod_1.z.object({
+      kind: zod_1.z.literal("product_gallery"),
+      title: zod_1.z.string().min(1),
+      product: catalog_1.Product
+    });
     exports.CategoryBlock = zod_1.z.discriminatedUnion("kind", [
       exports.RailBlock,
       exports.LifestyleTextBlock,
       exports.FeaturedBlock,
+      exports.ProductGalleryBlock,
       exports.LifestyleImageBlock,
       exports.GridBlock,
       exports.ReviewBlock,
@@ -4483,7 +4517,7 @@ function requireCart() {
   hasRequiredCart = 1;
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.PartnerCart = exports.PartnerCartItem = exports.CartHandoffResponse = exports.UpdateCartItemRequest = exports.AddCartItemRequest = exports.Cart = exports.HiddenSummaryLine = exports.CartLock = exports.CartLockReason = exports.CartTotals = exports.CartItem = void 0;
+    exports.PartnerCart = exports.PartnerCartItem = exports.CartHandoffResponse = exports.UpdateCartItemRequest = exports.AddCartItemRequest = exports.Cart = exports.HiddenSummaryLine = exports.CartHold = exports.CartLock = exports.CartLockReason = exports.CartTotals = exports.CartItem = void 0;
     const zod_1 = /* @__PURE__ */ requireZod();
     const money_1 = requireMoney();
     const ids_1 = requireIds();
@@ -4494,6 +4528,24 @@ function requireCart() {
       qty: zod_1.z.number().int().positive(),
       unit_price: money_1.Money,
       line_total: money_1.Money,
+      /**
+       * The undiscounted per-unit price, from the catalogue. Display only.
+       *
+       * Drawn as a struck-through figure under what the line costs now, with a `-NN%` badge
+       * over the thumbnail — Figma's cart draws every discounted line that way and, until
+       * this field existed, a consumer had no way to. The saving was simply invisible in the
+       * basket and appeared for the first time at checkout.
+       *
+       * Absent means the line is at full price, which is the ordinary case. Present only when
+       * it is strictly greater than `unit_price`: a compare-at equal to or below the live
+       * price is not a sale, and drawing one would be an invented discount.
+       *
+       * **The catalogue's figure, not an order's.** `OrderItem.compare_at_unit_price` is the
+       * one DAZN sent at intake and is frozen there, because a receipt whose struck price
+       * moves next week is not a receipt. A cart is live, so this one moves with
+       * merchandising — that is correct here and wrong there.
+       */
+      compare_at_unit_price: money_1.Money.optional(),
       /**
        * Product title for this line, e.g. "Signature Hoodie".
        *
@@ -4538,7 +4590,22 @@ function requireCart() {
        */
       available: zod_1.z.number().int().nonnegative().optional()
     });
-    exports.CartTotals = common_1.Pricing;
+    exports.CartTotals = common_1.Pricing.extend({
+      /**
+       * What came off across the whole basket, as a **positive** amount. Absent means nothing
+       * did; a zero is never sent.
+       *
+       * Positive rather than signed, and the surface that draws it owns the minus sign —
+       * exactly as `OrderTotals.discount` does. A signed field invites a reader to add it to a
+       * running total, and nothing here is a running total: every figure is server-computed
+       * and `total` is never derived by a consumer from the parts.
+       *
+       * Kept out of `subtotal` deliberately. The design lists a subtotal and a discount as two
+       * rows because the fan is owed both figures, and folding the saving into the subtotal
+       * loses the one they came for.
+       */
+      discount: money_1.Money.optional()
+    });
     exports.CartLockReason = zod_1.z.enum(["checkout_handoff"]);
     exports.CartLock = zod_1.z.object({
       since: zod_1.z.string().datetime(),
@@ -4546,6 +4613,10 @@ function requireCart() {
       expires_at: zod_1.z.string().datetime().optional(),
       reason: exports.CartLockReason
     });
+    exports.CartHold = zod_1.z.object({
+      taken_at: zod_1.z.string().datetime(),
+      expires_at: zod_1.z.string().datetime()
+    });
     exports.HiddenSummaryLine = zod_1.z.enum(["tax", "shipping"]);
     exports.Cart = zod_1.z.object({
       cart_id: ids_1.CartId,
@@ -4557,6 +4628,13 @@ function requireCart() {
        * consumer that has never heard of locking is unaffected.
        */
       locked: exports.CartLock.optional(),
+      /**
+       * Stock held for this cart while it sits in checkout. Absent = nothing held.
+       *
+       * Additive, and a consumer that has never heard of it is unaffected: the cart behaves
+       * exactly as it did, and the hold does its work server-side either way.
+       */
+      hold: exports.CartHold.optional(),
       /**
        * Summary rows to leave undrawn, resolved server-side from the CMS setting.
        *
@@ -4702,6 +4780,12 @@ function requireOrders() {
        * never used to price, and never shown on a picking list.
        */
       customer_ref: zod_1.z.string().min(1),
+      /**
+       * The fan's own name, for support and the order queue. Optional, and absent on every
+       * order placed before DAZN began sending it — the surfaces fall back to the recipient's
+       * name rather than showing a blank, which is what they did for all of them until now.
+       */
+      name: zod_1.z.string().min(1).optional(),
       /**
        * For carrier despatch notifications only. Optional because not every market's carrier
        * takes one, and an address is what actually ships the parcel.
@@ -4819,7 +4903,7 @@ function requireOrderTracking() {
   hasRequiredOrderTracking = 1;
   (function(exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.OrderDetail = exports.OrderList = exports.OrderSummaryItem = exports.OrderItem = exports.OrderTracking = exports.OrderProgressEntry = exports.OrderProgressStep = void 0;
+    exports.ReturnDetail = exports.ReturnItem = exports.ReturnProgressEntry = exports.CreateReturnRequest = exports.ReturnRequestItem = exports.FanReturnReason = exports.RequestCancellationRequest = exports.FanCancelReason = exports.OrderDetail = exports.ReturnSummary = exports.ReturnStatus = exports.OrderList = exports.OrderSummaryItem = exports.OrderItem = exports.OrderTracking = exports.OrderProgressEntry = exports.OrderProgressStep = void 0;
     const zod_1 = /* @__PURE__ */ requireZod();
     const money_1 = requireMoney();
     const ids_1 = requireIds();
@@ -4898,6 +4982,12 @@ function requireOrderTracking() {
     exports.OrderList = zod_1.z.object({
       orders: zod_1.z.array(exports.OrderSummaryItem)
     });
+    exports.ReturnStatus = zod_1.z.enum(["reported", "package_received", "completed"]);
+    exports.ReturnSummary = zod_1.z.object({
+      return_ref: zod_1.z.string().min(1),
+      status: exports.ReturnStatus,
+      reported_at: common_1.Timestamp
+    });
     exports.OrderDetail = zod_1.z.object({
       order_ref: ids_1.OrderRef,
       placed_at: common_1.Timestamp,
@@ -4923,7 +5013,72 @@ function requireOrderTracking() {
       ship_to: common_1.Address,
       payment: orders_1.OrderPaymentSummary.optional(),
       /** Exactly what DAZN charged, echoed. Never recomputed here. */
-      totals: orders_1.OrderTotals
+      totals: orders_1.OrderTotals,
+      /**
+       * Whether this order can still be cancelled, and whether it can be returned.
+       *
+       * **Decided by the engine and sent, not derived by the consumer from `status`.** The
+       * rule involves a dispatch cut-off and a returns window that a screen has no way of
+       * knowing, and two consumers deriving it independently would disagree the day either
+       * moves. Absent means no — an older engine that has never heard of either draws
+       * neither button, which is the safe way round for an action that cannot be undone.
+       */
+      can_cancel: zod_1.z.boolean().optional(),
+      can_return: zod_1.z.boolean().optional(),
+      /** Returns already reported against this order. Absent/empty = none. */
+      returns: zod_1.z.array(exports.ReturnSummary).optional()
+    });
+    exports.FanCancelReason = zod_1.z.enum([
+      "changed_my_mind",
+      "ordered_by_mistake",
+      "delivery_too_long"
+    ]);
+    exports.RequestCancellationRequest = zod_1.z.object({ reason: exports.FanCancelReason }).strict();
+    exports.FanReturnReason = zod_1.z.enum([
+      "too_large",
+      "too_small",
+      "arrived_too_late",
+      "item_damaged",
+      "not_as_described",
+      "changed_my_mind"
+    ]);
+    exports.ReturnRequestItem = zod_1.z.object({
+      line_ref: zod_1.z.string().min(1),
+      qty: zod_1.z.number().int().positive(),
+      reason: exports.FanReturnReason
+    });
+    exports.CreateReturnRequest = zod_1.z.object({ items: zod_1.z.array(exports.ReturnRequestItem).min(1) }).strict();
+    exports.ReturnProgressEntry = zod_1.z.object({
+      step: exports.ReturnStatus,
+      label: zod_1.z.string().min(1),
+      /** When the step completed. Absent = not reached yet, never a projected date. */
+      at: common_1.Timestamp.optional(),
+      current: zod_1.z.boolean()
+    });
+    exports.ReturnItem = zod_1.z.object({
+      line_ref: zod_1.z.string().min(1),
+      sku: common_1.Sku,
+      qty: zod_1.z.number().int().positive(),
+      reason: exports.FanReturnReason,
+      unit_price: money_1.Money,
+      compare_at_unit_price: money_1.Money.optional(),
+      title: zod_1.z.string().optional(),
+      image: common_1.Url.optional(),
+      attributes: common_1.Attributes.optional()
+    });
+    exports.ReturnDetail = zod_1.z.object({
+      return_ref: zod_1.z.string().min(1),
+      order_ref: ids_1.OrderRef,
+      status: exports.ReturnStatus,
+      reported_at: common_1.Timestamp,
+      progress: zod_1.z.array(exports.ReturnProgressEntry).min(1),
+      items: zod_1.z.array(exports.ReturnItem).min(1),
+      label_url: common_1.Url.optional(),
+      /**
+       * Where the label PDF was sent, for the frame's "You'll receive a shipping label PDF to
+       * your email as well" line. PII, like `OrderDetail.email`: render it, never log it.
+       */
+      label_email: zod_1.z.string().email().optional()
     });
   })(orderTracking);
   return orderTracking;
@@ -5098,10 +5253,10 @@ function requireClient() {
     code;
     requestId;
     body;
-    constructor(status2, parsed) {
-      super(parsed?.error.message ?? `DAZN API error (HTTP ${status2})`);
+    constructor(status, parsed) {
+      super(parsed?.error.message ?? `DAZN API error (HTTP ${status})`);
       this.name = "DaznApiError";
-      this.status = status2;
+      this.status = status;
       this.code = parsed?.error.code;
       this.requestId = parsed?.request_id;
       this.body = parsed?.error;
@@ -5132,8 +5287,8 @@ function requireClient() {
         ...options2.defaultHeaders,
         ...config.headers
       };
-      const body2 = config.body === void 0 && config.method === "POST" ? {} : config.body;
-      if (body2 !== void 0)
+      const body3 = config.body === void 0 && config.method === "POST" ? {} : config.body;
+      if (body3 !== void 0)
         headers["content-type"] = "application/json";
       if (token)
         headers["authorization"] = `Bearer ${token}`;
@@ -5141,7 +5296,7 @@ function requireClient() {
         method: config.method,
         headers,
         credentials: options2.credentials ?? "include",
-        body: body2 !== void 0 ? JSON.stringify(body2) : void 0
+        body: body3 !== void 0 ? JSON.stringify(body3) : void 0
       });
       if (!res.ok) {
         let parsed;
@@ -5234,11 +5389,11 @@ function requireClient() {
       cart: {
         create: () => request({ method: "POST", path: "/cart", schema: cart_1.Cart }),
         get: () => request({ method: "GET", path: "/cart", schema: cart_1.Cart }),
-        addItem: (body2) => request({ method: "POST", path: "/cart/items", body: body2, schema: cart_1.Cart }),
-        updateItem: (sku, body2) => request({
+        addItem: (body3) => request({ method: "POST", path: "/cart/items", body: body3, schema: cart_1.Cart }),
+        updateItem: (sku, body3) => request({
           method: "PATCH",
           path: `/cart/items/${encodeURIComponent(sku)}`,
-          body: body2,
+          body: body3,
           schema: cart_1.Cart
         }),
         removeItem: (sku) => request({
@@ -5264,7 +5419,7 @@ function requireClient() {
        */
       stockAlerts: {
         /** "Remind me when available" — idempotent per SKU for the session's principal. */
-        create: (body2) => request({ method: "POST", path: "/stock-alerts", body: body2, schema: stock_alerts_1.StockAlert })
+        create: (body3) => request({ method: "POST", path: "/stock-alerts", body: body3, schema: stock_alerts_1.StockAlert })
       },
       orders: {
         list: () => request({ method: "GET", path: "/orders", schema: order_tracking_1.OrderList }),
@@ -5272,6 +5427,32 @@ function requireClient() {
           method: "GET",
           path: `/orders/${encodeURIComponent(orderRef)}`,
           schema: order_tracking_1.OrderDetail
+        }),
+        /**
+         * Ask for the order to be cancelled (ADR-0024). Returns the order as it now stands.
+         *
+         * A request, not a refund: DAZN are merchant of record and the money is theirs to
+         * move. This records the fan's ask and hands it on.
+         */
+        requestCancellation: (orderRef, body3) => request({
+          method: "POST",
+          path: `/orders/${encodeURIComponent(orderRef)}/cancellation`,
+          body: body3,
+          schema: order_tracking_1.OrderDetail
+        }),
+        /** Report items coming back, and get the return — including its label when ready. */
+        createReturn: (orderRef, body3) => request({
+          method: "POST",
+          path: `/orders/${encodeURIComponent(orderRef)}/returns`,
+          body: body3,
+          schema: order_tracking_1.ReturnDetail
+        })
+      },
+      returns: {
+        get: (returnRef) => request({
+          method: "GET",
+          path: `/returns/${encodeURIComponent(returnRef)}`,
+          schema: order_tracking_1.ReturnDetail
         })
       },
       /**
@@ -5288,24 +5469,24 @@ function requireClient() {
          */
         uploadAttachment: (file) => upload("/support/attachments", file, support_1.SupportAttachment),
         /** File the ticket. Repeating an identical one within a few minutes returns the first. */
-        createTicket: (body2) => request({ method: "POST", path: "/support/tickets", body: body2, schema: support_1.SupportTicket })
+        createTicket: (body3) => request({ method: "POST", path: "/support/tickets", body: body3, schema: support_1.SupportTicket })
       },
       auth: {
         /** Exchange a single-use DAZN identity JWT for a session (sets the cookie). */
-        exchangeSession: (body2) => request({
+        exchangeSession: (body3) => request({
           method: "POST",
           path: "/auth/session",
-          body: body2,
+          body: body3,
           schema: session_1.SessionExchangeResponse
         }),
         /**
          * Redeem the `session` + `code` a DAZN redirect arrives with (sets the cookie).
          * The entry path from the DAZN app; see `ShopSessionRequest`.
          */
-        redeemShopSession: (body2) => request({
+        redeemShopSession: (body3) => request({
           method: "POST",
           path: "/auth/shop-session",
-          body: body2,
+          body: body3,
           schema: session_1.ShopSessionResponse
         })
       }
@@ -5385,26 +5566,28 @@ function DaznShopProvider({
       listeners.current.delete(listener);
     };
   }, []);
-  const emit = useCallback(
-    (event) => {
-      for (const listener of listeners.current) {
-        try {
-          listener(event);
-        } catch {
-        }
-      }
+  const onEventRef = useRef(onEvent);
+  onEventRef.current = onEvent;
+  const getTokenRef = useRef(getToken);
+  getTokenRef.current = getToken;
+  const stableGetToken = useCallback(() => getTokenRef.current(), []);
+  const emit = useCallback((event) => {
+    for (const listener of listeners.current) {
       try {
-        onEvent?.(event);
+        listener(event);
       } catch {
       }
-    },
-    [onEvent]
-  );
+    }
+    try {
+      onEventRef.current?.(event);
+    } catch {
+    }
+  }, []);
   const api = useMemo(
     () => clientExports.createClient({
       baseUrl: apiBaseUrl,
-      getToken,
-      fetch: createShopFetch({ getToken, onEvent, sessionTransport }),
+      getToken: stableGetToken,
+      fetch: createShopFetch({ getToken: stableGetToken, onEvent: emit, sessionTransport }),
       /**
        * Mounted in a host's page we are cross-origin with the API and hold no cookie,
        * so `omit` is right and the bearer token is the whole session story.
@@ -5416,9 +5599,10 @@ function DaznShopProvider({
        */
       credentials: sessionTransport === "cookie" ? "include" : "omit"
     }),
-    // `onEvent` is intentionally absent — see `emit` above.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [apiBaseUrl, getToken, sessionTransport]
+    // Only the two things that genuinely change the client. `stableGetToken` and `emit`
+    // are stable for the provider's lifetime by construction — see the refs above — so a
+    // host's re-render can no longer drop every in-flight request.
+    [apiBaseUrl, stableGetToken, emit, sessionTransport]
   );
   const navigate = useCallback(
     (to) => {
@@ -5535,29 +5719,29 @@ function ShopImage({
     }
   );
 }
-const badge$4 = "_badge_1bagf_1";
+const badge$5 = "_badge_1bagf_1";
 const neutral$1 = "_neutral_1bagf_12";
 const success$1 = "_success_1bagf_17";
 const critical$1 = "_critical_1bagf_22";
 const promo = "_promo_1bagf_27";
-const styles$I = {
-  badge: badge$4,
+const styles$P = {
+  badge: badge$5,
   neutral: neutral$1,
   success: success$1,
   critical: critical$1,
   promo
 };
 function Badge({ tone = "neutral", children }) {
-  return /* @__PURE__ */ jsx("span", { className: [styles$I.badge, styles$I[tone]].join(" "), children });
-}
-const button$1 = "_button_tdhm8_1";
-const fullWidth = "_fullWidth_tdhm8_25";
-const primary = "_primary_tdhm8_29";
-const secondary = "_secondary_tdhm8_34";
-const ghost = "_ghost_tdhm8_40";
-const spinner = "_spinner_tdhm8_62";
-const spin = "_spin_tdhm8_62";
-const styles$H = {
+  return /* @__PURE__ */ jsx("span", { className: [styles$P.badge, styles$P[tone]].join(" "), children });
+}
+const button$1 = "_button_1u2uh_1";
+const fullWidth = "_fullWidth_1u2uh_25";
+const primary = "_primary_1u2uh_29";
+const secondary = "_secondary_1u2uh_34";
+const ghost = "_ghost_1u2uh_40";
+const spinner = "_spinner_1u2uh_83";
+const spin = "_spin_1u2uh_83";
+const styles$O = {
   button: button$1,
   fullWidth,
   primary,
@@ -5583,23 +5767,23 @@ const Button = forwardRef(function Button2({
       ref,
       type,
       className: [
-        styles$H.button,
-        styles$H[variant],
-        fullWidth2 ? styles$H.fullWidth : "",
+        styles$O.button,
+        styles$O[variant],
+        fullWidth2 ? styles$O.fullWidth : "",
         className ?? ""
       ].filter(Boolean).join(" "),
       disabled: isDisabled,
       "aria-busy": loading || void 0,
       ...rest,
       children: [
-        loading && /* @__PURE__ */ jsx("span", { className: styles$H.spinner, "aria-hidden": "true" }),
+        loading && /* @__PURE__ */ jsx("span", { className: styles$O.spinner, "aria-hidden": "true" }),
         /* @__PURE__ */ jsx("span", { children })
       ]
     }
   );
 });
 const skeleton = "_skeleton_1nxz7_1";
-const styles$G = {
+const styles$N = {
   skeleton
 };
 function Skeleton({ width, height, radius, className, circle }) {
@@ -5612,24 +5796,32 @@ function Skeleton({ width, height, radius, className, circle }) {
     "span",
     {
       "aria-hidden": "true",
-      className: [styles$G.skeleton, className ?? ""].filter(Boolean).join(" "),
+      className: [styles$N.skeleton, className ?? ""].filter(Boolean).join(" "),
       style
     }
   );
 }
 const surface$1 = "_surface_cfqo9_10";
 const fill = "_fill_cfqo9_35";
-const styles$F = {
+const styles$M = {
   surface: surface$1,
   fill
 };
+function offsetFromViewportTop(el) {
+  let top = el.getBoundingClientRect().top;
+  for (let node = el.parentElement; node; node = node.parentElement) {
+    top += node.scrollTop;
+    if (getComputedStyle(node).position === "fixed") break;
+  }
+  const offset = Math.max(0, Math.round(top));
+  return offset >= window.innerHeight ? 0 : offset;
+}
 function useTopOffset(ref, property, enabled = true) {
   useEffect(() => {
     const el = ref.current;
     if (!el || !enabled) return;
     const measure = () => {
-      const top = Math.max(0, Math.round(el.getBoundingClientRect().top + window.scrollY));
-      el.style.setProperty(property, `${top}px`);
+      el.style.setProperty(property, `${offsetFromViewportTop(el)}px`);
     };
     measure();
     window.addEventListener("resize", measure);
@@ -5660,7 +5852,7 @@ const ShopSurface = forwardRef(function ShopSurface2({ tone, fill: fill2 = false
       ...rest,
       ref: attach,
       "data-shop-theme": tone,
-      className: [styles$F.surface, fill2 ? styles$F.fill : "", className ?? ""].filter(Boolean).join(" "),
+      className: [styles$M.surface, fill2 ? styles$M.fill : "", className ?? ""].filter(Boolean).join(" "),
       children
     }
   );
@@ -5668,52 +5860,56 @@ const ShopSurface = forwardRef(function ShopSurface2({ tone, fill: fill2 = false
 const root$6 = "_root_ney0g_1";
 const inner = "_inner_ney0g_6";
 const media$3 = "_media_ney0g_20";
-const lines$3 = "_lines_ney0g_32";
+const lines$2 = "_lines_ney0g_32";
 const lineWide = "_lineWide_ney0g_41";
 const lineMid = "_lineMid_ney0g_45";
 const lineNarrow = "_lineNarrow_ney0g_49";
-const row$8 = "_row_ney0g_53";
+const row$9 = "_row_ney0g_53";
 const action$2 = "_action_ney0g_57";
-const styles$E = {
+const styles$L = {
   root: root$6,
   inner,
   media: media$3,
-  lines: lines$3,
+  lines: lines$2,
   lineWide,
   lineMid,
   lineNarrow,
-  row: row$8,
+  row: row$9,
   action: action$2
 };
 function ScreenSkeleton({ tone, shape = "media" }) {
-  return /* @__PURE__ */ jsx(ShopSurface, { tone, fill: true, className: styles$E.root, children: /* @__PURE__ */ jsx("div", { className: styles$E.inner, role: "status", "aria-label": "Loading", children: shape === "media" ? /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(Skeleton, { className: styles$E.media }),
-    /* @__PURE__ */ jsxs("div", { className: styles$E.lines, children: [
-      /* @__PURE__ */ jsx(Skeleton, { height: 22, className: styles$E.lineWide }),
-      /* @__PURE__ */ jsx(Skeleton, { height: 16, className: styles$E.lineMid }),
-      /* @__PURE__ */ jsx(Skeleton, { height: 16, className: styles$E.lineNarrow })
+  return /* @__PURE__ */ jsx(ShopSurface, { tone, fill: true, className: styles$L.root, children: /* @__PURE__ */ jsx("div", { className: styles$L.inner, role: "status", "aria-label": "Loading", children: shape === "media" ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Skeleton, { className: styles$L.media }),
+    /* @__PURE__ */ jsxs("div", { className: styles$L.lines, children: [
+      /* @__PURE__ */ jsx(Skeleton, { height: 22, className: styles$L.lineWide }),
+      /* @__PURE__ */ jsx(Skeleton, { height: 16, className: styles$L.lineMid }),
+      /* @__PURE__ */ jsx(Skeleton, { height: 16, className: styles$L.lineNarrow })
     ] }),
-    /* @__PURE__ */ jsx(Skeleton, { height: 48, radius: 8, className: styles$E.action })
-  ] }) : /* @__PURE__ */ jsx("div", { className: styles$E.lines, children: [0, 1, 2, 3].map((i) => /* @__PURE__ */ jsx(Skeleton, { height: 72, className: styles$E.row }, i)) }) }) });
-}
-const root$5 = "_root_1u83t_1";
-const icon$4 = "_icon_1u83t_10";
-const title$j = "_title_1u83t_15";
-const body$5 = "_body_1u83t_20";
-const action$1 = "_action_1u83t_33";
-const styles$D = {
+    /* @__PURE__ */ jsx(Skeleton, { height: 48, radius: 8, className: styles$L.action })
+  ] }) : /* @__PURE__ */ jsx("div", { className: styles$L.lines, children: [0, 1, 2, 3].map((i) => /* @__PURE__ */ jsx(Skeleton, { height: 72, className: styles$L.row }, i)) }) }) });
+}
+const root$5 = "_root_ryf3q_6";
+const icon$4 = "_icon_ryf3q_15";
+const text$5 = "_text_ryf3q_21";
+const title$n = "_title_ryf3q_35";
+const body$8 = "_body_ryf3q_40";
+const action$1 = "_action_ryf3q_48";
+const styles$K = {
   root: root$5,
   icon: icon$4,
-  title: title$j,
-  body: body$5,
+  text: text$5,
+  title: title$n,
+  body: body$8,
   action: action$1
 };
-function EmptyState({ title: title2, body: body2, action: action2, icon: icon2 }) {
-  return /* @__PURE__ */ jsxs("div", { className: styles$D.root, role: "status", children: [
-    icon2 && /* @__PURE__ */ jsx("div", { className: styles$D.icon, children: icon2 }),
-    /* @__PURE__ */ jsx("h2", { className: styles$D.title, children: title2 }),
-    body2 && /* @__PURE__ */ jsx("p", { className: styles$D.body, children: body2 }),
-    action2 && /* @__PURE__ */ jsx("div", { className: styles$D.action, children: action2 })
+function EmptyState({ title: title2, body: body3, action: action2, icon: icon2 }) {
+  return /* @__PURE__ */ jsxs("div", { className: styles$K.root, role: "status", children: [
+    icon2 && /* @__PURE__ */ jsx("div", { className: styles$K.icon, children: icon2 }),
+    /* @__PURE__ */ jsxs("div", { className: styles$K.text, children: [
+      /* @__PURE__ */ jsx("h2", { className: styles$K.title, children: title2 }),
+      body3 && /* @__PURE__ */ jsx("p", { className: styles$K.body, children: body3 })
+    ] }),
+    action2 && /* @__PURE__ */ jsx("div", { className: styles$K.action, children: action2 })
   ] });
 }
 const TREATMENTS = {
@@ -5784,9 +5980,13 @@ const TREATMENTS = {
   /**
    * Codes a fan cannot reach, kept because this map is exhaustive over `ErrorCode`.
    *
-   * `order_not_found` and `order_not_cancellable` belong to order intake, which DAZN
-   * calls server to server; `forbidden` and `invalid_transition` belong to the operations
-   * console. None of them can arrive on a storefront request.
+   * `forbidden` and `invalid_transition` belong to the operations console and cannot
+   * arrive on a storefront request.
+   *
+   * `order_not_found` and `order_not_cancellable` no longer belong to that list, and this
+   * comment used to say they did. Both are fan-facing now: ADR-0024 gave us the cancel and
+   * return requests, and the engine raises `order_not_cancellable` for a cancellation past
+   * the dispatch cut-off AND for a return outside the window.
    *
    * They are given real copy rather than a shrug because the alternative is worse: this
    * map is a `Record<ErrorCode, …>` precisely so a new code fails the build here and gets
@@ -5850,19 +6050,19 @@ function isDuplicateOrder(err) {
   return codeOf(err) === "duplicate_order";
 }
 const root$4 = "_root_1lbpx_1";
-const title$i = "_title_1lbpx_10";
-const body$4 = "_body_1lbpx_15";
-const styles$C = {
+const title$m = "_title_1lbpx_10";
+const body$7 = "_body_1lbpx_15";
+const styles$J = {
   root: root$4,
-  title: title$i,
-  body: body$4
+  title: title$m,
+  body: body$7
 };
-function ErrorState({ code, title: title2, body: body2, onRetry, retryLabel }) {
+function ErrorState({ code, title: title2, body: body3, onRetry, retryLabel }) {
   const treatment = treatmentFor(code);
   const showRetry = Boolean(onRetry) && treatment.retriable;
-  return /* @__PURE__ */ jsxs("div", { className: styles$C.root, role: "alert", children: [
-    /* @__PURE__ */ jsx("h2", { className: styles$C.title, children: title2 ?? treatment.title }),
-    /* @__PURE__ */ jsx("p", { className: styles$C.body, children: body2 ?? treatment.body }),
+  return /* @__PURE__ */ jsxs("div", { className: styles$J.root, role: "alert", children: [
+    /* @__PURE__ */ jsx("h2", { className: styles$J.title, children: title2 ?? treatment.title }),
+    /* @__PURE__ */ jsx("p", { className: styles$J.body, children: body3 ?? treatment.body }),
     showRetry && /* @__PURE__ */ jsx(Button, { variant: "secondary", onClick: onRetry, children: retryLabel ?? "Try again" })
   ] });
 }
@@ -5882,9 +6082,9 @@ const STATUS_TONE = {
   cancelled: "critical",
   refunded: "critical"
 };
-function StatusBadge({ status: status2 }) {
-  const tone = STATUS_TONE[status2] ?? "neutral";
-  const label2 = STATUS_LABEL[status2] ?? status2;
+function StatusBadge({ status }) {
+  const tone = STATUS_TONE[status] ?? "neutral";
+  const label2 = STATUS_LABEL[status] ?? status;
   return /* @__PURE__ */ jsx(Badge, { tone, children: label2 });
 }
 const viewport = "_viewport_5aafz_14";
@@ -5899,9 +6099,9 @@ const success = "_success_5aafz_163";
 const critical = "_critical_5aafz_168";
 const rich = "_rich_5aafz_183";
 const description = "_description_5aafz_198";
-const thumb$2 = "_thumb_5aafz_216";
+const thumb$3 = "_thumb_5aafz_216";
 const thumbImage = "_thumbImage_5aafz_227";
-const styles$B = {
+const styles$I = {
   viewport,
   anchor,
   caret,
@@ -5914,7 +6114,7 @@ const styles$B = {
   critical,
   rich,
   description,
-  thumb: thumb$2,
+  thumb: thumb$3,
   thumbImage
 };
 const ToastContext = createContext(null);
@@ -6011,35 +6211,35 @@ function ToastProvider({ children }) {
   const api = useMemo(() => ({ show }), [show]);
   return /* @__PURE__ */ jsxs(ToastContext.Provider, { value: api, children: [
     children,
-    /* @__PURE__ */ jsx("div", { className: styles$B.viewport, ref: viewportRef, "aria-live": "polite", "aria-atomic": "false", children: toasts.map((t) => {
+    /* @__PURE__ */ jsx("div", { className: styles$I.viewport, ref: viewportRef, "aria-live": "polite", "aria-atomic": "false", children: toasts.map((t) => {
       const rich2 = Boolean(t.description || t.image);
-      return /* @__PURE__ */ jsxs("div", { className: styles$B.anchor, children: [
-        t.anchor === "cart" && /* @__PURE__ */ jsx("span", { className: styles$B.caret, children: /* @__PURE__ */ jsx(Caret, {}) }),
+      return /* @__PURE__ */ jsxs("div", { className: styles$I.anchor, children: [
+        t.anchor === "cart" && /* @__PURE__ */ jsx("span", { className: styles$I.caret, children: /* @__PURE__ */ jsx(Caret, {}) }),
         /* @__PURE__ */ jsxs(
           "div",
           {
-            className: [styles$B.toast, rich2 ? styles$B.rich : styles$B[t.tone]].join(" "),
+            className: [styles$I.toast, rich2 ? styles$I.rich : styles$I[t.tone]].join(" "),
             role: "status",
             children: [
-              t.image && /* @__PURE__ */ jsx("span", { className: styles$B.thumb, children: /* @__PURE__ */ jsx(
+              t.image && /* @__PURE__ */ jsx("span", { className: styles$I.thumb, children: /* @__PURE__ */ jsx(
                 ShopImage,
                 {
                   src: t.image,
                   alt: "",
                   fill: true,
                   sizes: "40px",
-                  className: styles$B.thumbImage
+                  className: styles$I.thumbImage
                 }
               ) }),
-              /* @__PURE__ */ jsxs("span", { className: styles$B.text, children: [
-                /* @__PURE__ */ jsx("span", { className: styles$B.message, children: t.message }),
-                t.description && /* @__PURE__ */ jsx("span", { className: styles$B.description, children: t.description })
+              /* @__PURE__ */ jsxs("span", { className: styles$I.text, children: [
+                /* @__PURE__ */ jsx("span", { className: styles$I.message, children: t.message }),
+                t.description && /* @__PURE__ */ jsx("span", { className: styles$I.description, children: t.description })
               ] }),
               t.action && /* @__PURE__ */ jsx(
                 "button",
                 {
                   type: "button",
-                  className: styles$B.action,
+                  className: styles$I.action,
                   onClick: () => {
                     t.action?.onAction();
                     dismiss(t.id);
@@ -6100,15 +6300,15 @@ function useLocale(override) {
   const shop = useShopOptional();
   return override ?? shop?.locale ?? shop?.market?.lang ?? (typeof navigator !== "undefined" ? navigator.language : void 0);
 }
-const badge$3 = "_badge_156ya_2";
+const badge$4 = "_badge_156ya_2";
 const icon$3 = "_icon_156ya_18";
-const styles$A = {
-  badge: badge$3,
+const styles$H = {
+  badge: badge$4,
   icon: icon$3
 };
 function SaleBadge({ pct }) {
-  return /* @__PURE__ */ jsxs("span", { className: styles$A.badge, children: [
-    /* @__PURE__ */ jsxs("svg", { className: styles$A.icon, width: "12", height: "12", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
+  return /* @__PURE__ */ jsxs("span", { className: styles$H.badge, children: [
+    /* @__PURE__ */ jsxs("svg", { className: styles$H.icon, width: "12", height: "12", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
       /* @__PURE__ */ jsx(
         "path",
         {
@@ -6125,23 +6325,25 @@ function SaleBadge({ pct }) {
     "%"
   ] });
 }
-const root$3 = "_root_n3nm5_1";
-const center$1 = "_center_n3nm5_10";
-const end = "_end_n3nm5_14";
-const sm = "_sm_n3nm5_21";
-const md = "_md_n3nm5_24";
-const lg = "_lg_n3nm5_27";
-const price$1 = "_price_n3nm5_31";
-const compareAt = "_compareAt_n3nm5_36";
-const strikethrough = "_strikethrough_n3nm5_44";
-const styles$z = {
+const root$3 = "_root_rvfx9_1";
+const center$1 = "_center_rvfx9_10";
+const end = "_end_rvfx9_14";
+const sm = "_sm_rvfx9_28";
+const md = "_md_rvfx9_32";
+const lg = "_lg_rvfx9_36";
+const badge$3 = "_badge_rvfx9_48";
+const price$4 = "_price_rvfx9_52";
+const compareAt = "_compareAt_rvfx9_57";
+const strikethrough = "_strikethrough_rvfx9_65";
+const styles$G = {
   root: root$3,
   center: center$1,
   end,
   sm,
   md,
   lg,
-  price: price$1,
+  badge: badge$3,
+  price: price$4,
   compareAt,
   strikethrough
 };
@@ -6156,15 +6358,130 @@ function PriceBlock({
   const { format } = useMoney();
   const pct = discountPct$1 ?? discountPct(price2, compareAt2);
   const hasCompare = compareAt2 && compareAt2.amount > price2.amount;
-  return /* @__PURE__ */ jsxs("div", { className: [styles$z.root, styles$z[size], styles$z[align], styles$z[variant]].join(" "), children: [
-    /* @__PURE__ */ jsx("span", { className: styles$z.price, children: format(price2) }),
-    hasCompare && /* @__PURE__ */ jsxs("span", { className: styles$z.compareAt, children: [
+  return /* @__PURE__ */ jsxs("div", { className: [styles$G.root, styles$G[size], styles$G[align], styles$G[variant]].join(" "), children: [
+    /* @__PURE__ */ jsx("span", { className: styles$G.price, children: format(price2) }),
+    hasCompare && /* @__PURE__ */ jsxs("span", { className: styles$G.compareAt, children: [
       /* @__PURE__ */ jsx("span", { className: "visually-hidden", children: `Was ${format(compareAt2)}` }),
       /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: format(compareAt2) })
     ] }),
     hasCompare && variant === "badge" && pct !== void 0 && /* @__PURE__ */ jsx(SaleBadge, { pct })
   ] });
 }
+const timeline = "_timeline_1cum7_7";
+const row$8 = "_row_1cum7_15";
+const line$3 = "_line_1cum7_20";
+const marker = "_marker_1cum7_27";
+const tick = "_tick_1cum7_35";
+const pending$2 = "_pending_1cum7_44";
+const connector = "_connector_1cum7_68";
+const text$3 = "_text_1cum7_84";
+const label$2 = "_label_1cum7_101";
+const past = "_past_1cum7_113";
+const current = "_current_1cum7_118";
+const future = "_future_1cum7_133";
+const date$1 = "_date_1cum7_138";
+const styles$F = {
+  timeline,
+  row: row$8,
+  line: line$3,
+  marker,
+  tick,
+  pending: pending$2,
+  connector,
+  text: text$3,
+  label: label$2,
+  past,
+  current,
+  future,
+  date: date$1
+};
+function OrderTimeline({
+  progress: progress2,
+  estimatedDelivery,
+  locale: localeProp
+}) {
+  const locale = useLocale(localeProp);
+  const currentIndex = progress2.findIndex((e) => e.current);
+  return /* @__PURE__ */ jsx("ol", { className: styles$F.timeline, children: progress2.map((entry, i) => {
+    const state = stateOf(entry, i, currentIndex);
+    const estimate = !entry.at && i === progress2.length - 1 && estimatedDelivery ? formatWindow(estimatedDelivery, locale) : void 0;
+    return /* @__PURE__ */ jsxs(
+      "li",
+      {
+        className: styles$F.row,
+        "aria-current": entry.current ? "step" : void 0,
+        children: [
+          /* @__PURE__ */ jsxs("div", { className: styles$F.line, children: [
+            /* @__PURE__ */ jsx("span", { className: styles$F.marker, children: state === "future" ? /* @__PURE__ */ jsx("span", { className: styles$F.pending, "aria-hidden": "true" }) : /* @__PURE__ */ jsx(StepTick, { tone: state }) }),
+            /* @__PURE__ */ jsxs("span", { className: styles$F.text, children: [
+              /* @__PURE__ */ jsx("span", { className: [styles$F.label, styles$F[state]].join(" "), children: entry.label }),
+              entry.at ? /* @__PURE__ */ jsx("time", { className: styles$F.date, dateTime: entry.at, children: formatStepDate(entry.at, locale) }) : estimate && /* @__PURE__ */ jsx("span", { className: styles$F.date, children: estimate })
+            ] })
+          ] }),
+          i < progress2.length - 1 && /* @__PURE__ */ jsx("span", { className: styles$F.connector, "aria-hidden": "true" })
+        ]
+      },
+      entry.step
+    );
+  }) });
+}
+function stateOf(entry, index, currentIndex) {
+  if (entry.current) return "current";
+  if (currentIndex === -1) return entry.at ? "past" : "future";
+  return index < currentIndex ? "past" : "future";
+}
+function StepTick({ tone }) {
+  return /* @__PURE__ */ jsxs(
+    "svg",
+    {
+      className: styles$F.tick,
+      width: "28",
+      height: "28",
+      viewBox: "0 0 28 28",
+      fill: "none",
+      "aria-hidden": "true",
+      children: [
+        /* @__PURE__ */ jsx(
+          "path",
+          {
+            d: "M14 1C21.1797 1 27 6.8203 27 14C27 21.1797 21.1797 27 14 27C6.8203 27 1 21.1797 1 14C1 6.8203 6.8203 1 14 1Z",
+            fill: "#F9FAFA",
+            stroke: "#F9FAFA",
+            strokeWidth: "2"
+          }
+        ),
+        /* @__PURE__ */ jsx(
+          "path",
+          {
+            d: "M13.9943 26C12.3436 26 10.7913 25.6856 9.33743 25.0568C7.89115 24.4356 6.61903 23.5758 5.52106 22.4773C4.4231 21.3788 3.55987 20.1061 2.93138 18.6591C2.31046 17.2045 2 15.6515 2 14C2 12.3409 2.31046 10.7879 2.93138 9.34091C3.55987 7.88636 4.4231 6.60985 5.52106 5.51136C6.61903 4.41288 7.89115 3.55303 9.33743 2.93182C10.7913 2.31061 12.3436 2 13.9943 2C15.6526 2 17.2049 2.31061 18.6512 2.93182C20.1051 3.55303 21.381 4.41288 22.4789 5.51136C23.5769 6.60985 24.4363 7.88636 25.0573 9.34091C25.6858 10.7879 26 12.3409 26 14C26 15.6515 25.6858 17.2045 25.0573 18.6591C24.4363 20.1061 23.5769 21.3788 22.4789 22.4773C21.381 23.5758 20.1051 24.4356 18.6512 25.0568C17.2049 25.6856 15.6526 26 13.9943 26ZM12.7449 19.6932C12.9948 19.6932 13.222 19.6364 13.4264 19.5227C13.6384 19.4015 13.8202 19.2311 13.9716 19.0114L19.2532 10.9432C19.3441 10.7992 19.416 10.6515 19.469 10.5C19.5296 10.3485 19.5599 10.2008 19.5599 10.0568C19.5599 9.70833 19.4274 9.42045 19.1623 9.19318C18.9049 8.96591 18.6058 8.85227 18.265 8.85227C17.8183 8.85227 17.4434 9.0947 17.1406 9.57955L12.7222 16.6136L10.7345 14.1818C10.5831 13.9924 10.424 13.8561 10.2575 13.7727C10.0984 13.6894 9.91292 13.6477 9.7009 13.6477C9.36015 13.6477 9.06484 13.7727 8.81495 14.0227C8.56507 14.2652 8.44013 14.5606 8.44013 14.9091C8.44013 15.0758 8.47042 15.2348 8.531 15.3864C8.59158 15.5379 8.68623 15.6932 8.81495 15.8523L11.4728 19.0341C11.6545 19.2538 11.8476 19.4205 12.0521 19.5341C12.2565 19.6402 12.4875 19.6932 12.7449 19.6932Z",
+            fill: tone === "current" ? "#0C161C" : "#B3B9BB"
+          }
+        )
+      ]
+    }
+  );
+}
+function formatStepDate(iso, locale) {
+  const date2 = new Date(iso);
+  const weekday = date2.toLocaleDateString(locale, { weekday: "long" });
+  const dayMonth = date2.toLocaleDateString(locale, { day: "numeric", month: "short" });
+  return `${weekday}, ${dayMonth}`;
+}
+function formatWindow(window2, locale) {
+  const from = new Date(window2.from);
+  const to = new Date(window2.to);
+  const utc = { timeZone: "UTC" };
+  const weekday = from.toLocaleDateString(locale, { weekday: "long", ...utc });
+  const dayMonth = (d) => d.toLocaleDateString(locale, { day: "numeric", month: "short", ...utc });
+  const sameDay = from.getUTCFullYear() === to.getUTCFullYear() && from.getUTCMonth() === to.getUTCMonth() && from.getUTCDate() === to.getUTCDate();
+  if (sameDay) return `${weekday}, ${dayMonth(from)}`;
+  if (from.getUTCMonth() !== to.getUTCMonth()) {
+    return `${weekday} ${dayMonth(from)} - ${dayMonth(to)}`;
+  }
+  const day = (d) => d.toLocaleDateString(locale, { day: "numeric", ...utc });
+  const month = new Intl.DateTimeFormat(locale, { month: "short", ...utc }).formatToParts(from).find((part) => part.type === "month")?.value;
+  return month ? `${weekday} ${day(from)}-${day(to)} ${month}` : `${weekday} ${dayMonth(from)} - ${dayMonth(to)}`;
+}
 const COLOUR_KEYS = ["colour", "color"];
 function colourKeyOf(variants) {
   return COLOUR_KEYS.find((k) => variants.some((v) => k in v.attributes)) ?? null;
@@ -6250,118 +6567,24 @@ const SWATCH_HEX = {
   green: "#147e4a",
   beige: "#e8e0d2"
 };
-function swatchColour(name) {
-  return SWATCH_HEX[name.toLowerCase().trim()] ?? "#c9cdd0";
+function swatchColour(name2) {
+  return SWATCH_HEX[name2.toLowerCase().trim()] ?? "#c9cdd0";
 }
-const timeline = "_timeline_1cum7_7";
-const row$7 = "_row_1cum7_15";
-const line$2 = "_line_1cum7_20";
-const marker = "_marker_1cum7_27";
-const tick = "_tick_1cum7_35";
-const pending$2 = "_pending_1cum7_44";
-const connector = "_connector_1cum7_68";
-const text$3 = "_text_1cum7_84";
-const label$1 = "_label_1cum7_101";
-const past = "_past_1cum7_113";
-const current = "_current_1cum7_118";
-const future = "_future_1cum7_133";
-const date$1 = "_date_1cum7_138";
-const styles$y = {
-  timeline,
+const summary = "_summary_1hsxt_2";
+const row$7 = "_row_1hsxt_16";
+const free = "_free_1hsxt_53";
+const pending$1 = "_pending_1hsxt_59";
+const discount = "_discount_1hsxt_69";
+const styles$E = {
+  summary,
   row: row$7,
-  line: line$2,
-  marker,
-  tick,
-  pending: pending$2,
-  connector,
-  text: text$3,
-  label: label$1,
-  past,
-  current,
-  future,
-  date: date$1
-};
-function OrderTimeline({ progress: progress2, locale: localeProp }) {
-  const locale = useLocale(localeProp);
-  const currentIndex = progress2.findIndex((e) => e.current);
-  return /* @__PURE__ */ jsx("ol", { className: styles$y.timeline, children: progress2.map((entry, i) => {
-    const state = stateOf(entry, i, currentIndex);
-    return /* @__PURE__ */ jsxs(
-      "li",
-      {
-        className: styles$y.row,
-        "aria-current": entry.current ? "step" : void 0,
-        children: [
-          /* @__PURE__ */ jsxs("div", { className: styles$y.line, children: [
-            /* @__PURE__ */ jsx("span", { className: styles$y.marker, children: state === "future" ? /* @__PURE__ */ jsx("span", { className: styles$y.pending, "aria-hidden": "true" }) : /* @__PURE__ */ jsx(StepTick, { tone: state }) }),
-            /* @__PURE__ */ jsxs("span", { className: styles$y.text, children: [
-              /* @__PURE__ */ jsx("span", { className: [styles$y.label, styles$y[state]].join(" "), children: entry.label }),
-              entry.at && /* @__PURE__ */ jsx("time", { className: styles$y.date, dateTime: entry.at, children: formatStepDate(entry.at, locale) })
-            ] })
-          ] }),
-          i < progress2.length - 1 && /* @__PURE__ */ jsx("span", { className: styles$y.connector, "aria-hidden": "true" })
-        ]
-      },
-      entry.step
-    );
-  }) });
-}
-function stateOf(entry, index, currentIndex) {
-  if (entry.current) return "current";
-  if (currentIndex === -1) return entry.at ? "past" : "future";
-  return index < currentIndex ? "past" : "future";
-}
-function StepTick({ tone }) {
-  return /* @__PURE__ */ jsxs(
-    "svg",
-    {
-      className: styles$y.tick,
-      width: "28",
-      height: "28",
-      viewBox: "0 0 28 28",
-      fill: "none",
-      "aria-hidden": "true",
-      children: [
-        /* @__PURE__ */ jsx(
-          "path",
-          {
-            d: "M14 1C21.1797 1 27 6.8203 27 14C27 21.1797 21.1797 27 14 27C6.8203 27 1 21.1797 1 14C1 6.8203 6.8203 1 14 1Z",
-            fill: "#F9FAFA",
-            stroke: "#F9FAFA",
-            strokeWidth: "2"
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          "path",
-          {
-            d: "M13.9943 26C12.3436 26 10.7913 25.6856 9.33743 25.0568C7.89115 24.4356 6.61903 23.5758 5.52106 22.4773C4.4231 21.3788 3.55987 20.1061 2.93138 18.6591C2.31046 17.2045 2 15.6515 2 14C2 12.3409 2.31046 10.7879 2.93138 9.34091C3.55987 7.88636 4.4231 6.60985 5.52106 5.51136C6.61903 4.41288 7.89115 3.55303 9.33743 2.93182C10.7913 2.31061 12.3436 2 13.9943 2C15.6526 2 17.2049 2.31061 18.6512 2.93182C20.1051 3.55303 21.381 4.41288 22.4789 5.51136C23.5769 6.60985 24.4363 7.88636 25.0573 9.34091C25.6858 10.7879 26 12.3409 26 14C26 15.6515 25.6858 17.2045 25.0573 18.6591C24.4363 20.1061 23.5769 21.3788 22.4789 22.4773C21.381 23.5758 20.1051 24.4356 18.6512 25.0568C17.2049 25.6856 15.6526 26 13.9943 26ZM12.7449 19.6932C12.9948 19.6932 13.222 19.6364 13.4264 19.5227C13.6384 19.4015 13.8202 19.2311 13.9716 19.0114L19.2532 10.9432C19.3441 10.7992 19.416 10.6515 19.469 10.5C19.5296 10.3485 19.5599 10.2008 19.5599 10.0568C19.5599 9.70833 19.4274 9.42045 19.1623 9.19318C18.9049 8.96591 18.6058 8.85227 18.265 8.85227C17.8183 8.85227 17.4434 9.0947 17.1406 9.57955L12.7222 16.6136L10.7345 14.1818C10.5831 13.9924 10.424 13.8561 10.2575 13.7727C10.0984 13.6894 9.91292 13.6477 9.7009 13.6477C9.36015 13.6477 9.06484 13.7727 8.81495 14.0227C8.56507 14.2652 8.44013 14.5606 8.44013 14.9091C8.44013 15.0758 8.47042 15.2348 8.531 15.3864C8.59158 15.5379 8.68623 15.6932 8.81495 15.8523L11.4728 19.0341C11.6545 19.2538 11.8476 19.4205 12.0521 19.5341C12.2565 19.6402 12.4875 19.6932 12.7449 19.6932Z",
-            fill: tone === "current" ? "#0C161C" : "#B3B9BB"
-          }
-        )
-      ]
-    }
-  );
-}
-function formatStepDate(iso, locale) {
-  const date2 = new Date(iso);
-  const weekday = date2.toLocaleDateString(locale, { weekday: "long" });
-  const dayMonth = date2.toLocaleDateString(locale, { day: "numeric", month: "short" });
-  return `${weekday}, ${dayMonth}`;
-}
-const summary = "_summary_1hsxt_2";
-const row$6 = "_row_1hsxt_16";
-const free = "_free_1hsxt_53";
-const pending$1 = "_pending_1hsxt_59";
-const discount = "_discount_1hsxt_69";
-const styles$x = {
-  summary,
-  row: row$6,
-  free,
-  pending: pending$1,
-  discount
+  free,
+  pending: pending$1,
+  discount
 };
 const CART_ROWS = [
   { label: "Subtotal", key: "subtotal" },
+  { label: "Discount", key: "discount" },
   { label: "Delivery", key: "shipping" },
   { label: "Tax", key: "tax" },
   { label: "Total", key: "total" }
@@ -6375,109 +6598,378 @@ function OrderSummary({
 }) {
   const { format } = useMoney();
   const isDeferred = (key) => deferred.includes(key);
-  const anyDeferred = deferred.length > 0;
-  const visible = rows.filter((row2) => !hidden.includes(row2.key)).filter((row2) => row2.key !== "total" || !anyDeferred).filter((row2) => row2.key !== "discount" || discount2 !== void 0);
-  return /* @__PURE__ */ jsx("dl", { className: styles$x.summary, children: visible.map(({ label: label2, key }) => {
+  const visible = rows.filter((row2) => !hidden.includes(row2.key)).filter((row2) => row2.key !== "discount" || discount2 !== void 0);
+  return /* @__PURE__ */ jsx("dl", { className: styles$E.summary, children: visible.map(({ label: label2, key }) => {
     if (key === "discount" && discount2) {
-      return /* @__PURE__ */ jsxs("div", { className: [styles$x.row, styles$x.discount].join(" "), children: [
+      return /* @__PURE__ */ jsxs("div", { className: [styles$E.row, styles$E.discount].join(" "), children: [
         /* @__PURE__ */ jsx("dt", { children: label2 }),
         /* @__PURE__ */ jsx("dd", { children: `−${format(discount2)}` })
       ] }, key);
     }
     const pending2 = key !== "total" && isDeferred(key);
-    return /* @__PURE__ */ jsxs("div", { className: styles$x.row, children: [
+    return /* @__PURE__ */ jsxs("div", { className: styles$E.row, children: [
       /* @__PURE__ */ jsx("dt", { children: label2 }),
-      /* @__PURE__ */ jsx("dd", { className: pending2 ? styles$x.pending : void 0, children: pending2 ? "Calculated at checkout" : renderValue(key, pricing, format) })
+      /* @__PURE__ */ jsx("dd", { className: pending2 ? styles$E.pending : void 0, children: pending2 ? "Calculated at checkout" : renderValue(key, pricing, format) })
     ] }, key);
   }) });
 }
 function renderValue(key, pricing, format) {
   if (key === "shipping" && pricing.shipping.amount === 0) {
-    return /* @__PURE__ */ jsx("span", { className: styles$x.free, children: "Free" });
+    return /* @__PURE__ */ jsx("span", { className: styles$E.free, children: "Free" });
   }
   return key === "discount" ? null : format(pricing[key]);
 }
-const page$3 = "_page_1eqkm_1";
-const status = "_status_1eqkm_10";
-const widget = "_widget_1eqkm_18";
-const title$h = "_title_1eqkm_24";
-const headline$1 = "_headline_1eqkm_30";
-const subtitle$4 = "_subtitle_1eqkm_37";
-const dot$3 = "_dot_1eqkm_48";
-const trackButton = "_trackButton_1eqkm_58";
-const srOnly = "_srOnly_1eqkm_78";
-const itemsCard = "_itemsCard_1eqkm_92";
-const cardHeader = "_cardHeader_1eqkm_100";
-const cardTitle$1 = "_cardTitle_1eqkm_108";
-const count$1 = "_count_1eqkm_115";
-const lines$2 = "_lines_1eqkm_130";
-const line$1 = "_line_1eqkm_130";
-const thumb$1 = "_thumb_1eqkm_152";
-const image$9 = "_image_1eqkm_162";
-const placeholder$6 = "_placeholder_1eqkm_166";
-const lineBody$1 = "_lineBody_1eqkm_172";
-const lineText$1 = "_lineText_1eqkm_180";
-const lineTitle$1 = "_lineTitle_1eqkm_189";
-const lineDetails = "_lineDetails_1eqkm_197";
-const linePrice$1 = "_linePrice_1eqkm_205";
-const details$1 = "_details_1eqkm_215";
-const detailBlock = "_detailBlock_1eqkm_228";
-const payment = "_payment_1eqkm_235";
-const detailLabel = "_detailLabel_1eqkm_239";
-const detailValue = "_detailValue_1eqkm_245";
-const last4 = "_last4_1eqkm_256";
-const brand = "_brand_1eqkm_262";
-const divider$2 = "_divider_1eqkm_268";
-const summaryCard$1 = "_summaryCard_1eqkm_275";
-const styles$w = {
-  page: page$3,
-  status,
-  widget,
-  title: title$h,
-  headline: headline$1,
-  subtitle: subtitle$4,
-  dot: dot$3,
-  trackButton,
-  srOnly,
-  itemsCard,
-  cardHeader,
-  cardTitle: cardTitle$1,
-  count: count$1,
-  lines: lines$2,
-  line: line$1,
-  thumb: thumb$1,
+const lines$1 = "_lines_7mr8w_19";
+const line$2 = "_line_7mr8w_19";
+const thumb$2 = "_thumb_7mr8w_34";
+const image$9 = "_image_7mr8w_44";
+const placeholder$8 = "_placeholder_7mr8w_48";
+const lineBody = "_lineBody_7mr8w_53";
+const lineText = "_lineText_7mr8w_62";
+const lineTitle = "_lineTitle_7mr8w_72";
+const lineMeta = "_lineMeta_7mr8w_91";
+const linePrice = "_linePrice_7mr8w_106";
+const paid$3 = "_paid_7mr8w_118";
+const was$4 = "_was_7mr8w_124";
+const card$4 = "_card_7mr8w_144";
+const cardTitle = "_cardTitle_7mr8w_152";
+const cardBody = "_cardBody_7mr8w_164";
+const summaryCard = "_summaryCard_7mr8w_136";
+const styles$D = {
+  lines: lines$1,
+  line: line$2,
+  thumb: thumb$2,
   image: image$9,
-  placeholder: placeholder$6,
-  lineBody: lineBody$1,
-  lineText: lineText$1,
-  lineTitle: lineTitle$1,
-  lineDetails,
-  linePrice: linePrice$1,
-  details: details$1,
-  detailBlock,
-  payment,
-  detailLabel,
-  detailValue,
-  last4,
-  brand,
-  divider: divider$2,
-  summaryCard: summaryCard$1
+  placeholder: placeholder$8,
+  lineBody,
+  lineText,
+  lineTitle,
+  lineMeta,
+  linePrice,
+  paid: paid$3,
+  was: was$4,
+  card: card$4,
+  cardTitle,
+  cardBody,
+  summaryCard
 };
-const SUMMARY_ROWS$1 = [
+const SUMMARY_ROWS = [
   { label: "Subtotal", key: "subtotal" },
-  { label: "Tax", key: "tax" },
+  { label: "Discount", key: "discount" },
   { label: "Shipping", key: "shipping" },
   { label: "Total", key: "total" }
 ];
+function OrderLine({ item: item2 }) {
+  const { format } = useMoney();
+  const compareAt2 = item2.compare_at_unit_price;
+  const pct = compareAt2 ? discountPct(item2.unit_price, compareAt2) : void 0;
+  const details2 = detailsOf(item2);
+  return /* @__PURE__ */ jsxs("li", { className: styles$D.line, children: [
+    /* @__PURE__ */ jsx("div", { className: styles$D.thumb, children: item2.image ? /* @__PURE__ */ jsx(ShopImage, { src: item2.image, alt: "", fill: true, sizes: "48px", className: styles$D.image }) : /* @__PURE__ */ jsx("div", { className: styles$D.placeholder, "aria-hidden": "true" }) }),
+    /* @__PURE__ */ jsxs("div", { className: styles$D.lineBody, children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$D.lineText, children: [
+        /* @__PURE__ */ jsx("span", { className: styles$D.lineTitle, children: item2.title ?? item2.sku }),
+        /* @__PURE__ */ jsxs("span", { className: styles$D.lineMeta, children: [
+          details2.map((detail2) => /* @__PURE__ */ jsx("span", { children: detail2 }, detail2)),
+          pct !== void 0 && /* @__PURE__ */ jsx(SaleBadge, { pct })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs("span", { className: styles$D.linePrice, children: [
+        /* @__PURE__ */ jsx("span", { className: styles$D.paid, children: format(item2.line_total) }),
+        compareAt2 && /* @__PURE__ */ jsxs("span", { className: styles$D.was, children: [
+          /* @__PURE__ */ jsx("span", { className: "visually-hidden", children: `Was ${format(compareAt2)}` }),
+          /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: format(compareAt2) })
+        ] })
+      ] })
+    ] })
+  ] });
+}
+function OrderLines({ order }) {
+  return /* @__PURE__ */ jsx("ul", { className: styles$D.lines, "aria-label": "Items", children: order.items.map((item2) => /* @__PURE__ */ jsx(OrderLine, { item: item2 }, item2.line_ref)) });
+}
+function ShippingAddressCard({ order }) {
+  return /* @__PURE__ */ jsxs("section", { className: styles$D.card, "aria-label": "Shipping address", children: [
+    /* @__PURE__ */ jsx("h2", { className: styles$D.cardTitle, children: "Shipping address" }),
+    /* @__PURE__ */ jsx("p", { className: styles$D.cardBody, children: formatAddress(order.ship_to) })
+  ] });
+}
+function OrderSummaryCard({ order }) {
+  return /* @__PURE__ */ jsxs("section", { className: [styles$D.card, styles$D.summaryCard].join(" "), "aria-label": "Order summary", children: [
+    /* @__PURE__ */ jsx("h2", { className: styles$D.cardTitle, children: "Order summary" }),
+    /* @__PURE__ */ jsx(OrderSummary, { pricing: toPricing(order), rows: rowsFor(order), discount: order.totals.discount })
+  ] });
+}
+function detailsOf(item2) {
+  const pairs = variantPairs(item2.attributes).map((p) => `${p.label}: ${p.value}`);
+  return item2.qty > 1 ? [...pairs, `Qty: ${item2.qty}`] : pairs;
+}
+function rowsFor(order) {
+  if (order.totals.tax.amount === 0) return SUMMARY_ROWS;
+  return SUMMARY_ROWS.flatMap(
+    (row2) => row2.key === "shipping" ? [row2, { label: "Tax", key: "tax" }] : [row2]
+  );
+}
+function toPricing(order) {
+  return {
+    subtotal: order.totals.items,
+    shipping: order.totals.shipping,
+    tax: order.totals.tax,
+    total: order.totals.grand_total
+  };
+}
+function formatAddress(address) {
+  return [address.line1, address.line2, address.postcode, address.city, address.country].filter(Boolean).join(", ");
+}
+const header$6 = "_header_1f3nh_7";
+const slot = "_slot_1f3nh_15";
+const handleSlot = "_handleSlot_1f3nh_23";
+const handle = "_handle_1f3nh_23";
+const closeSlot$1 = "_closeSlot_1f3nh_35";
+const close$2 = "_close_1f3nh_35";
+const styles$C = {
+  header: header$6,
+  slot,
+  handleSlot,
+  handle,
+  closeSlot: closeSlot$1,
+  close: close$2
+};
+function CloseIcon$1() {
+  return /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx("g", { transform: "translate(2.667 2.667)", children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      fillRule: "evenodd",
+      clipRule: "evenodd",
+      d: "M10.6667 1.12866L9.538 0L5.33333 4.21262L1.12866 0L0 1.12866L4.21262 5.33333L0 9.538L1.12866 10.6667L5.33333 6.45405L9.538 10.6667L10.6667 9.538L6.45405 5.33333L10.6667 1.12866Z",
+      fill: "currentColor"
+    }
+  ) }) });
+}
+function SheetHeader({ onClose, closeLabel }) {
+  return /* @__PURE__ */ jsxs("div", { className: styles$C.header, children: [
+    /* @__PURE__ */ jsx("div", { className: styles$C.slot, "aria-hidden": "true" }),
+    /* @__PURE__ */ jsx("div", { className: styles$C.handleSlot, "aria-hidden": "true", children: /* @__PURE__ */ jsx("div", { className: styles$C.handle }) }),
+    /* @__PURE__ */ jsx("button", { type: "button", className: styles$C.closeSlot, onClick: onClose, "aria-label": closeLabel, children: /* @__PURE__ */ jsx("span", { className: styles$C.close, children: /* @__PURE__ */ jsx(CloseIcon$1, {}) }) })
+  ] });
+}
+const FOCUSABLE = 'a[href], button:not([disabled]), textarea, input, select, [tabindex]:not([tabindex="-1"])';
+function useModalDialog(open, onClose, ref) {
+  const handleKeyDown = useCallback(
+    (e) => {
+      if (e.key === "Escape") {
+        e.preventDefault();
+        onClose();
+        return;
+      }
+      if (e.key !== "Tab") return;
+      const dialog = ref.current;
+      if (!dialog) return;
+      const focusables = Array.from(dialog.querySelectorAll(FOCUSABLE)).filter(
+        (el) => el.offsetParent !== null || el === document.activeElement
+      );
+      if (focusables.length === 0) {
+        e.preventDefault();
+        return;
+      }
+      const first = focusables[0];
+      const last = focusables[focusables.length - 1];
+      if (e.shiftKey && document.activeElement === first) {
+        e.preventDefault();
+        last.focus();
+      } else if (!e.shiftKey && document.activeElement === last) {
+        e.preventDefault();
+        first.focus();
+      }
+    },
+    [onClose, ref]
+  );
+  useEffect(() => {
+    if (!open) return;
+    const previouslyFocused = document.activeElement;
+    document.addEventListener("keydown", handleKeyDown);
+    ref.current?.querySelector(FOCUSABLE)?.focus();
+    const { overflow } = document.body.style;
+    document.body.style.overflow = "hidden";
+    return () => {
+      document.removeEventListener("keydown", handleKeyDown);
+      document.body.style.overflow = overflow;
+      previouslyFocused?.focus?.();
+    };
+  }, [open, handleKeyDown, ref]);
+}
+const scrim$5 = "_scrim_7on4q_8";
+const sheet$3 = "_sheet_7on4q_20";
+const body$6 = "_body_7on4q_32";
+const title$l = "_title_7on4q_46";
+const options$1 = "_options_7on4q_54";
+const option$1 = "_option_7on4q_54";
+const radio = "_radio_7on4q_88";
+const label$1 = "_label_7on4q_118";
+const footer$1 = "_footer_7on4q_127";
+const error$1 = "_error_7on4q_135";
+const styles$B = {
+  scrim: scrim$5,
+  sheet: sheet$3,
+  body: body$6,
+  title: title$l,
+  options: options$1,
+  option: option$1,
+  radio,
+  label: label$1,
+  footer: footer$1,
+  error: error$1
+};
+function ReasonSheet({
+  title: title2,
+  options: options2,
+  ctaLabel,
+  selected: selected2,
+  onConfirm,
+  onClose,
+  closeLabel,
+  busy = false,
+  error: error2
+}) {
+  const sheetRef = useRef(null);
+  const [choice, setChoice] = useState(selected2);
+  useModalDialog(true, onClose, sheetRef);
+  return /* @__PURE__ */ jsx("div", { className: styles$B.scrim, onClick: onClose, children: /* @__PURE__ */ jsxs(
+    ShopSurface,
+    {
+      tone: "light",
+      ref: sheetRef,
+      className: styles$B.sheet,
+      role: "dialog",
+      "aria-modal": "true",
+      "aria-labelledby": "reason-sheet-title",
+      onClick: (e) => e.stopPropagation(),
+      children: [
+        /* @__PURE__ */ jsx(SheetHeader, { onClose, closeLabel }),
+        /* @__PURE__ */ jsxs("div", { className: styles$B.body, children: [
+          /* @__PURE__ */ jsx("h2", { id: "reason-sheet-title", className: styles$B.title, children: title2 }),
+          /* @__PURE__ */ jsx("div", { className: styles$B.options, role: "radiogroup", "aria-labelledby": "reason-sheet-title", children: options2.map((o) => /* @__PURE__ */ jsxs(
+            "button",
+            {
+              type: "button",
+              role: "radio",
+              "aria-checked": o.value === choice,
+              className: styles$B.option,
+              onClick: () => setChoice(o.value),
+              children: [
+                /* @__PURE__ */ jsx("span", { className: styles$B.radio, "aria-hidden": "true", children: o.value === choice && /* @__PURE__ */ jsxs("svg", { width: "20", height: "20", viewBox: "0 0 20 20", fill: "none", children: [
+                  /* @__PURE__ */ jsx("circle", { cx: "10", cy: "10", r: "10", fill: "currentColor" }),
+                  /* @__PURE__ */ jsx(
+                    "path",
+                    {
+                      d: "m5.8 10.3 2.7 2.7 5.7-5.7",
+                      stroke: "var(--color-text-strong)",
+                      strokeWidth: "1.8",
+                      strokeLinecap: "round",
+                      strokeLinejoin: "round"
+                    }
+                  )
+                ] }) }),
+                /* @__PURE__ */ jsx("span", { className: styles$B.label, children: o.label })
+              ]
+            },
+            o.value
+          )) })
+        ] }),
+        /* @__PURE__ */ jsxs("div", { className: styles$B.footer, children: [
+          error2 && /* @__PURE__ */ jsx("p", { className: styles$B.error, role: "alert", children: error2 }),
+          /* @__PURE__ */ jsx(
+            Button,
+            {
+              variant: "primary",
+              fullWidth: true,
+              disabled: !choice,
+              loading: busy,
+              onClick: () => choice && onConfirm(choice),
+              children: ctaLabel
+            }
+          )
+        ] })
+      ]
+    }
+  ) });
+}
+const page$6 = "_page_opefg_8";
+const widget = "_widget_opefg_18";
+const titleRow = "_titleRow_opefg_26";
+const headline$1 = "_headline_opefg_42";
+const track$5 = "_track_opefg_61";
+const rule = "_rule_opefg_86";
+const help = "_help_opefg_96";
+const helpTitle = "_helpTitle_opefg_102";
+const helpRows = "_helpRows_opefg_109";
+const helpRow = "_helpRow_opefg_109";
+const cancel = "_cancel_opefg_167";
+const cancelledHead = "_cancelledHead_opefg_191";
+const cancelledTitle = "_cancelledTitle_opefg_197";
+const cancelledMeta = "_cancelledMeta_opefg_206";
+const styles$A = {
+  page: page$6,
+  widget,
+  titleRow,
+  headline: headline$1,
+  track: track$5,
+  rule,
+  help,
+  helpTitle,
+  helpRows,
+  helpRow,
+  cancel,
+  cancelledHead,
+  cancelledTitle,
+  cancelledMeta
+};
+function RedirectLink() {
+  return /* @__PURE__ */ jsxs("svg", { width: "14", height: "14", viewBox: "0 0 14 14", fill: "none", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M3.37413 1.63539C2.84882 1.63539 2.39164 1.90422 2.08646 2.29534C1.78479 2.68228 1.63445 3.17776 1.63445 3.66795V3.67088L1.66569 10.3328C1.66636 10.8221 1.81652 11.3164 2.1177 11.7025C2.42287 12.0935 2.8802 12.3615 3.40537 12.3615L3.4044 12.3625L10.6248 12.3654C11.1499 12.3653 11.6063 12.0965 11.9115 11.7054C12.2134 11.3185 12.3644 10.8232 12.3645 10.3328V8.33347C12.3645 7.94707 12.0508 7.63363 11.6645 7.63349C11.278 7.63349 10.9645 7.94699 10.9645 8.33347V10.3328C10.9644 10.5489 10.8962 10.7317 10.8083 10.8444C10.7238 10.9526 10.6512 10.9654 10.6248 10.9654L3.40537 10.9625C3.37921 10.9625 3.30653 10.9498 3.22184 10.8415C3.13389 10.7287 3.06474 10.5461 3.06466 10.3299V10.327L3.03342 3.66405C3.03416 3.44927 3.10311 3.26759 3.1906 3.15542C3.27527 3.04709 3.34796 3.03436 3.37413 3.03436H5.44477C5.83092 3.03423 6.14439 2.72147 6.14474 2.33537C6.14474 1.94897 5.83113 1.63553 5.44477 1.63539H3.37413Z",
+        fill: "currentColor"
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M8.683 1.63442C8.29663 1.63442 7.9832 1.94806 7.98303 2.33439C7.98303 2.72087 8.29652 3.03436 8.683 3.03436H9.97458L6.504 6.50495C6.23093 6.77819 6.23093 7.22163 6.504 7.49487C6.77724 7.76794 7.22068 7.76794 7.49392 7.49487L10.9645 4.02331V5.31587C10.9645 5.70233 11.278 6.01582 11.6645 6.01584C12.0508 6.01571 12.3645 5.70226 12.3645 5.31587V2.33439C12.3643 2.04478 12.1878 1.79638 11.9369 1.69006L11.9271 1.68616C11.9116 1.67987 11.8951 1.67664 11.8793 1.67152C11.8526 1.66289 11.8261 1.6535 11.7982 1.64809C11.7924 1.64696 11.7865 1.64711 11.7807 1.64613C11.7428 1.63977 11.7042 1.63443 11.6645 1.63442H8.683Z",
+        fill: "currentColor"
+      }
+    )
+  ] });
+}
+function ChevronRight$1() {
+  return /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx("g", { transform: "translate(4.28 1.96)", children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      d: "M7.42763 6.03763C7.42763 5.83763 7.33763 5.64763 7.18763 5.51763L1.15763 0.177629C0.867628 -0.0823714 0.427629 -0.0523713 0.177629 0.237629C-0.0823713 0.527629 -0.0523714 0.967629 0.237629 1.22763L5.67763 6.04763L0.237629 10.8576C-0.0523709 11.1176 -0.0823709 11.5576 0.177629 11.8476C0.437629 12.1376 0.877629 12.1676 1.16763 11.9076L7.19763 6.56763C7.34763 6.43763 7.43763 6.24763 7.43763 6.04763L7.42763 6.03763Z",
+      fill: "currentColor"
+    }
+  ) }) });
+}
 function OrderTrackingView(props) {
   return /* @__PURE__ */ jsx(ShopSurface, { tone: "light", fill: true, children: /* @__PURE__ */ jsx(OrderTrackingContent, { ...props }) });
 }
-function OrderTrackingContent({ orderRef, locale: localeProp }) {
+function OrderTrackingContent({
+  orderRef,
+  locale: localeProp,
+  onStartReturn,
+  onContactSupport,
+  onCancelled,
+  onReorder
+}) {
   const { api } = useShop();
   const locale = useLocale(localeProp);
   const [order, setOrder] = useState(null);
   const [state, setState] = useState("loading");
   const [errorCode, setErrorCode] = useState(void 0);
+  const [cancelOpen, setCancelOpen] = useState(false);
+  const [cancelling, setCancelling] = useState(false);
+  const [cancelError, setCancelError] = useState(null);
+  const emit = useShopEvent();
   const load = useCallback(async () => {
     setState("loading");
     try {
@@ -6492,164 +6984,561 @@ function OrderTrackingContent({ orderRef, locale: localeProp }) {
     void load();
   }, [load]);
   if (state === "loading") {
-    return /* @__PURE__ */ jsxs("div", { className: styles$w.page, children: [
-      /* @__PURE__ */ jsx(Skeleton, { height: 120, radius: 8 }),
-      /* @__PURE__ */ jsx(Skeleton, { height: 220, radius: 18 }),
-      /* @__PURE__ */ jsx(Skeleton, { height: 140, radius: 18 })
+    return /* @__PURE__ */ jsxs("div", { className: styles$A.page, children: [
+      /* @__PURE__ */ jsx(Skeleton, { height: 206, radius: 8 }),
+      /* @__PURE__ */ jsx(Skeleton, { height: 48, radius: 8 }),
+      /* @__PURE__ */ jsx(Skeleton, { height: 113, radius: 18 }),
+      /* @__PURE__ */ jsx(Skeleton, { height: 240, radius: 18 })
     ] });
   }
   if (state === "error" || !order) {
     return /* @__PURE__ */ jsx(ErrorState, { code: errorCode, onRetry: () => void load() });
   }
-  return /* @__PURE__ */ jsxs("div", { className: styles$w.page, children: [
-    /* @__PURE__ */ jsxs("section", { className: styles$w.status, "aria-label": "Delivery status", children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$w.title, children: [
-        /* @__PURE__ */ jsx("h1", { className: styles$w.headline, children: order.headline }),
-        /* @__PURE__ */ jsxs("p", { className: styles$w.subtitle, children: [
-          /* @__PURE__ */ jsx("span", { children: `Order #${shortRef$1(order.order_ref)}` }),
-          /* @__PURE__ */ jsx("span", { className: styles$w.dot, "aria-hidden": "true" }),
-          /* @__PURE__ */ jsx("span", { children: `Placed ${formatPlaced$1(order.placed_at, locale)}` })
-        ] })
+  async function confirmCancellation(reason2) {
+    setCancelling(true);
+    setCancelError(null);
+    try {
+      const updated = await api.orders.requestCancellation(orderRef, { reason: reason2 });
+      setOrder(updated);
+      setCancelOpen(false);
+      emit({ type: "order_cancellation_requested", orderRef, reason: reason2 });
+      onCancelled?.(updated);
+    } catch (err) {
+      setCancelError(treatmentFor(codeOf(err)).body);
+    } finally {
+      setCancelling(false);
+    }
+  }
+  if (order.status === "cancelled") {
+    return /* @__PURE__ */ jsxs("div", { className: styles$A.page, children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$A.cancelledHead, children: [
+        /* @__PURE__ */ jsx("h1", { className: styles$A.cancelledTitle, children: "Order cancelled" }),
+        /* @__PURE__ */ jsx("p", { className: styles$A.cancelledMeta, children: `Order #${shortRef$1(order.order_ref)} · Placed ${placedOn(order.placed_at, locale)}` })
       ] }),
-      /* @__PURE__ */ jsxs("div", { className: styles$w.widget, children: [
-        /* @__PURE__ */ jsx(OrderTimeline, { progress: order.progress, locale }),
+      onReorder && /* @__PURE__ */ jsx(
+        Button,
+        {
+          variant: "primary",
+          fullWidth: true,
+          onClick: () => {
+            emit({ type: "reorder_requested", orderRef: order.order_ref });
+            onReorder();
+          },
+          children: "Reorder"
+        }
+      ),
+      /* @__PURE__ */ jsx(OrderLines, { order }),
+      /* @__PURE__ */ jsx(ShippingAddressCard, { order }),
+      /* @__PURE__ */ jsx(OrderSummaryCard, { order })
+    ] });
+  }
+  return /* @__PURE__ */ jsxs("div", { className: styles$A.page, children: [
+    /* @__PURE__ */ jsxs("section", { className: styles$A.widget, "aria-label": "Delivery status", children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$A.titleRow, children: [
+        /* @__PURE__ */ jsx("h1", { className: styles$A.headline, children: `Order #${shortRef$1(order.order_ref)}` }),
         order.tracking?.url && /* @__PURE__ */ jsxs(
           "a",
           {
-            className: styles$w.trackButton,
+            className: styles$A.track,
             href: order.tracking.url,
             target: "_blank",
             rel: "noopener noreferrer",
             children: [
-              "Track order",
-              /* @__PURE__ */ jsx("span", { className: styles$w.srOnly, children: ` (opens ${order.tracking.carrier} in a new tab)` })
+              "Track",
+              /* @__PURE__ */ jsx("span", { className: "visually-hidden", children: ` ${order.tracking.carrier}, opens in a new tab` }),
+              /* @__PURE__ */ jsx(RedirectLink, {})
             ]
           }
         )
-      ] })
-    ] }),
-    /* @__PURE__ */ jsx(ItemsCard, { order }),
-    /* @__PURE__ */ jsxs("section", { className: styles$w.details, "aria-label": "Delivery and payment", children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$w.detailBlock, children: [
-        /* @__PURE__ */ jsx("h2", { className: styles$w.detailLabel, children: "Shipping address" }),
-        /* @__PURE__ */ jsx("p", { className: styles$w.detailValue, children: formatAddress$1(order.ship_to) })
       ] }),
-      order.payment && /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx("div", { className: styles$w.divider, role: "presentation" }),
-        /* @__PURE__ */ jsxs("div", { className: [styles$w.detailBlock, styles$w.payment].join(" "), children: [
-          /* @__PURE__ */ jsx("h2", { className: styles$w.detailLabel, children: "Payment" }),
-          /* @__PURE__ */ jsxs("p", { className: styles$w.detailValue, children: [
-            /* @__PURE__ */ jsx("span", { className: styles$w.brand, children: order.payment.brand }),
-            order.payment.last4 && /* @__PURE__ */ jsxs("span", { className: styles$w.last4, children: [
-              "•••• ",
-              order.payment.last4
-            ] })
-          ] })
-        ] })
-      ] })
+      /* @__PURE__ */ jsx(
+        OrderTimeline,
+        {
+          progress: order.progress,
+          ...order.estimated_delivery ? { estimatedDelivery: order.estimated_delivery } : {},
+          locale
+        }
+      ),
+      order.can_return && onStartReturn && /* @__PURE__ */ jsx(Button, { variant: "secondary", fullWidth: true, onClick: onStartReturn, children: "Return items" })
     ] }),
-    /* @__PURE__ */ jsxs("section", { className: styles$w.summaryCard, "aria-label": "Order summary", children: [
-      /* @__PURE__ */ jsx("h2", { className: styles$w.cardTitle, children: "Order summary" }),
-      /* @__PURE__ */ jsx(OrderSummary, { pricing: toPricing$1(order), rows: SUMMARY_ROWS$1 })
+    /* @__PURE__ */ jsx("hr", { className: styles$A.rule }),
+    /* @__PURE__ */ jsx(OrderLines, { order }),
+    /* @__PURE__ */ jsx(ShippingAddressCard, { order }),
+    /* @__PURE__ */ jsx(OrderSummaryCard, { order }),
+    order.can_cancel && /* @__PURE__ */ jsx("button", { type: "button", className: styles$A.cancel, onClick: () => setCancelOpen(true), children: "Cancel order" }),
+    /* @__PURE__ */ jsx(
+      NeedHelp,
+      {
+        order,
+        ...onStartReturn ? { onStartReturn } : {},
+        ...onContactSupport ? { onContactSupport } : {}
+      }
+    ),
+    cancelOpen && /* @__PURE__ */ jsx(
+      ReasonSheet,
+      {
+        title: "Reason for cancelling",
+        options: CANCEL_REASONS,
+        ctaLabel: "Cancel order",
+        closeLabel: "Close reasons",
+        busy: cancelling,
+        onClose: () => setCancelOpen(false),
+        onConfirm: (reason2) => void confirmCancellation(reason2),
+        ...cancelError ? { error: cancelError } : {}
+      }
+    )
+  ] });
+}
+const CANCEL_REASONS = [
+  { value: "changed_my_mind", label: "Changed my mind" },
+  { value: "ordered_by_mistake", label: "Ordered by mistake" },
+  { value: "delivery_too_long", label: "Delivery takes too long" }
+];
+function placedOn(iso, locale) {
+  const d = new Date(iso);
+  const day = d.getUTCDate();
+  const month = new Intl.DateTimeFormat(locale, { month: "short", timeZone: "UTC" }).format(d);
+  return `${day} ${month}, ${d.getUTCFullYear()}`;
+}
+function NeedHelp({
+  order,
+  onStartReturn,
+  onContactSupport
+}) {
+  const emit = useShopEvent();
+  if (order.status !== "delivered") return null;
+  return /* @__PURE__ */ jsxs("section", { className: styles$A.help, "aria-labelledby": "order-help", children: [
+    /* @__PURE__ */ jsx("h2", { className: styles$A.helpTitle, id: "order-help", children: "Need help?" }),
+    /* @__PURE__ */ jsxs("div", { className: styles$A.helpRows, children: [
+      onStartReturn && /* @__PURE__ */ jsx(HelpRow, { label: "Start a return", onClick: onStartReturn }),
+      /* @__PURE__ */ jsx(
+        HelpRow,
+        {
+          label: "Contact support",
+          onClick: () => {
+            emit({ type: "support_requested", orderRef: order.order_ref });
+            onContactSupport?.();
+          }
+        }
+      )
     ] })
   ] });
 }
-function ItemsCard({ order }) {
+function HelpRow({ label: label2, onClick }) {
+  return /* @__PURE__ */ jsxs("button", { type: "button", className: styles$A.helpRow, onClick, children: [
+    /* @__PURE__ */ jsx("span", { children: label2 }),
+    /* @__PURE__ */ jsx(ChevronRight$1, {})
+  ] });
+}
+function shortRef$1(orderRef) {
+  return orderRef.replace(/^ord_/, "");
+}
+const page$5 = "_page_1c7ro_7";
+const titles$2 = "_titles_1c7ro_15";
+const title$k = "_title_1c7ro_15";
+const subtitle$7 = "_subtitle_1c7ro_30";
+const list$2 = "_list_1c7ro_38";
+const card$3 = "_card_1c7ro_48";
+const checkSlot = "_checkSlot_1c7ro_61";
+const check = "_check_1c7ro_61";
+const row$6 = "_row_1c7ro_105";
+const line$1 = "_line_1c7ro_113";
+const thumb$1 = "_thumb_1c7ro_119";
+const img$1 = "_img_1c7ro_129";
+const placeholder$7 = "_placeholder_1c7ro_133";
+const meta$2 = "_meta_1c7ro_138";
+const name$2 = "_name_1c7ro_147";
+const attrs$1 = "_attrs_1c7ro_159";
+const price$3 = "_price_1c7ro_167";
+const paid$2 = "_paid_1c7ro_176";
+const was$3 = "_was_1c7ro_184";
+const reason = "_reason_1c7ro_199";
+const reasonSet = "_reasonSet_1c7ro_217";
+const styles$z = {
+  page: page$5,
+  titles: titles$2,
+  title: title$k,
+  subtitle: subtitle$7,
+  list: list$2,
+  card: card$3,
+  checkSlot,
+  check,
+  row: row$6,
+  line: line$1,
+  thumb: thumb$1,
+  img: img$1,
+  placeholder: placeholder$7,
+  meta: meta$2,
+  name: name$2,
+  attrs: attrs$1,
+  price: price$3,
+  paid: paid$2,
+  was: was$3,
+  reason,
+  reasonSet
+};
+function Chevron$1() {
+  return /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
+    "path",
+    {
+      d: "m6.3 4.1 3.4 3.9-3.4 3.9",
+      stroke: "currentColor",
+      strokeWidth: "1.6",
+      strokeLinecap: "round",
+      strokeLinejoin: "round"
+    }
+  ) });
+}
+function Tick() {
+  return /* @__PURE__ */ jsxs("svg", { width: "20", height: "20", viewBox: "0 0 20 20", fill: "none", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx("circle", { cx: "10", cy: "10", r: "10", fill: "currentColor" }),
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "m5.8 10.3 2.7 2.7 5.7-5.7",
+        stroke: "var(--color-text-strong)",
+        strokeWidth: "1.8",
+        strokeLinecap: "round",
+        strokeLinejoin: "round"
+      }
+    )
+  ] });
+}
+const RETURN_REASONS = [
+  { value: "too_large", label: "Too large" },
+  { value: "too_small", label: "Too small" },
+  { value: "arrived_too_late", label: "Arrived too late" },
+  { value: "item_damaged", label: "Item is damaged" },
+  { value: "not_as_described", label: "Item doesn't match description" },
+  { value: "changed_my_mind", label: "Changed my mind" }
+];
+const REASON_LABEL = new Map(RETURN_REASONS.map((r) => [r.value, r.label]));
+function ReturnItemsView({ order, onSubmit, busy = false }) {
   const { format } = useMoney();
-  return /* @__PURE__ */ jsxs("section", { className: styles$w.itemsCard, "aria-label": "Items", children: [
-    /* @__PURE__ */ jsxs("div", { className: styles$w.cardHeader, children: [
-      /* @__PURE__ */ jsx("h2", { className: styles$w.cardTitle, children: "Items" }),
-      /* @__PURE__ */ jsx("span", { className: styles$w.count, children: order.items.reduce((n, i) => n + i.qty, 0) })
+  const [chosen, setChosen] = useState({});
+  const [reasonFor, setReasonFor] = useState(null);
+  const returnable = useMemo(
+    () => order.items.filter((i) => i.qty - i.cancelled_qty - i.refunded_qty > 0),
+    [order.items]
+  );
+  const selected2 = Object.entries(chosen).filter(([, reason2]) => reason2 !== void 0);
+  const canSubmit = selected2.length > 0;
+  function remaining(item2) {
+    return item2.qty - item2.cancelled_qty - item2.refunded_qty;
+  }
+  function toggle2(lineRef) {
+    if (lineRef in chosen) {
+      setChosen((prev) => {
+        const next = { ...prev };
+        delete next[lineRef];
+        return next;
+      });
+      return;
+    }
+    setChosen((prev) => ({ ...prev, [lineRef]: void 0 }));
+    setReasonFor(lineRef);
+  }
+  function submit() {
+    const items2 = returnable.filter((i) => chosen[i.line_ref]).map((i) => ({
+      line_ref: i.line_ref,
+      qty: remaining(i),
+      reason: chosen[i.line_ref]
+    }));
+    if (items2.length > 0) onSubmit(items2);
+  }
+  return /* @__PURE__ */ jsxs("div", { className: styles$z.page, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$z.titles, children: [
+      /* @__PURE__ */ jsx("h1", { className: styles$z.title, children: "What do you want to return?" }),
+      /* @__PURE__ */ jsx("p", { className: styles$z.subtitle, children: "Select items you want to return" })
+    ] }),
+    /* @__PURE__ */ jsx("div", { className: styles$z.list, children: returnable.map((item2) => {
+      const picked = item2.line_ref in chosen;
+      const reason2 = chosen[item2.line_ref];
+      return /* @__PURE__ */ jsxs("div", { className: styles$z.card, children: [
+        /* @__PURE__ */ jsx(
+          "button",
+          {
+            type: "button",
+            role: "checkbox",
+            "aria-checked": picked,
+            "aria-label": item2.title ?? item2.sku,
+            className: styles$z.checkSlot,
+            onClick: () => toggle2(item2.line_ref),
+            children: /* @__PURE__ */ jsx("span", { className: styles$z.check, children: picked ? /* @__PURE__ */ jsx(Tick, {}) : null })
+          }
+        ),
+        /* @__PURE__ */ jsxs("div", { className: styles$z.row, children: [
+          /* @__PURE__ */ jsxs("div", { className: styles$z.line, children: [
+            /* @__PURE__ */ jsx("div", { className: styles$z.thumb, children: item2.image ? /* @__PURE__ */ jsx(ShopImage, { src: item2.image, alt: "", fill: true, sizes: "48px", className: styles$z.img }) : /* @__PURE__ */ jsx("div", { className: styles$z.placeholder, "aria-hidden": "true" }) }),
+            /* @__PURE__ */ jsxs("div", { className: styles$z.meta, children: [
+              /* @__PURE__ */ jsx("p", { className: styles$z.name, children: item2.title ?? item2.sku }),
+              item2.attributes?.size && /* @__PURE__ */ jsx("p", { className: styles$z.attrs, children: `Size: ${item2.attributes.size}` })
+            ] }),
+            /* @__PURE__ */ jsxs("div", { className: styles$z.price, children: [
+              /* @__PURE__ */ jsx("span", { className: styles$z.paid, children: format(item2.unit_price) }),
+              item2.compare_at_unit_price && /* @__PURE__ */ jsx("span", { className: styles$z.was, children: format(item2.compare_at_unit_price) })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxs(
+            "button",
+            {
+              type: "button",
+              className: `${styles$z.reason} ${reason2 ? styles$z.reasonSet : ""}`,
+              onClick: () => setReasonFor(item2.line_ref),
+              "aria-haspopup": "dialog",
+              children: [
+                /* @__PURE__ */ jsx("span", { children: reason2 ? REASON_LABEL.get(reason2) : "Select reason" }),
+                /* @__PURE__ */ jsx(Chevron$1, {})
+              ]
+            }
+          )
+        ] })
+      ] }, item2.line_ref);
+    }) }),
+    /* @__PURE__ */ jsx(Button, { variant: "primary", fullWidth: true, disabled: !canSubmit, loading: busy, onClick: submit, children: "Return selected items" }),
+    reasonFor && /* @__PURE__ */ jsx(
+      ReasonSheet,
+      {
+        title: "Reason for return",
+        options: RETURN_REASONS,
+        ctaLabel: "Select",
+        ...chosen[reasonFor] ? { selected: chosen[reasonFor] } : {},
+        closeLabel: "Close reasons",
+        onClose: () => setReasonFor(null),
+        onConfirm: (value2) => {
+          setChosen((prev) => ({ ...prev, [reasonFor]: value2 }));
+          setReasonFor(null);
+        }
+      }
+    )
+  ] });
+}
+const page$4 = "_page_1r0ea_7";
+const intro$1 = "_intro_1r0ea_15";
+const title$j = "_title_1r0ea_22";
+const subtitle$6 = "_subtitle_1r0ea_31";
+const card$2 = "_card_1r0ea_39";
+const step = "_step_1r0ea_49";
+const step2 = "_step2_1r0ea_56";
+const stepHead = "_stepHead_1r0ea_62";
+const number = "_number_1r0ea_69";
+const stepTitle = "_stepTitle_1r0ea_84";
+const body$5 = "_body_1r0ea_95";
+const body2 = "_body2_1r0ea_103";
+const download = "_download_1r0ea_121";
+const note$1 = "_note_1r0ea_143";
+const styles$y = {
+  page: page$4,
+  intro: intro$1,
+  title: title$j,
+  subtitle: subtitle$6,
+  card: card$2,
+  step,
+  step2,
+  stepHead,
+  number,
+  stepTitle,
+  body: body$5,
+  body2,
+  download,
+  note: note$1
+};
+function ReturnLabelView({ ret, onDone }) {
+  return /* @__PURE__ */ jsxs("div", { className: styles$y.page, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$y.intro, children: [
+      /* @__PURE__ */ jsx("h1", { className: styles$y.title, children: "We’ve generated your return label" }),
+      /* @__PURE__ */ jsx("p", { className: styles$y.subtitle, children: "Follow the instructions below to complete your return" })
     ] }),
-    /* @__PURE__ */ jsx("ul", { className: styles$w.lines, children: order.items.map((item2) => /* @__PURE__ */ jsxs("li", { className: styles$w.line, children: [
-      /* @__PURE__ */ jsx("div", { className: styles$w.thumb, children: item2.image ? /* @__PURE__ */ jsx(ShopImage, { src: item2.image, alt: "", fill: true, sizes: "48px", className: styles$w.image }) : /* @__PURE__ */ jsx("div", { className: styles$w.placeholder, "aria-hidden": "true" }) }),
-      /* @__PURE__ */ jsxs("div", { className: styles$w.lineBody, children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$w.lineText, children: [
-          /* @__PURE__ */ jsx("span", { className: styles$w.lineTitle, children: item2.title ?? item2.sku }),
-          detailsOf$1(item2).length > 0 && /* @__PURE__ */ jsx("span", { className: styles$w.lineDetails, children: detailsOf$1(item2).map((detail2) => /* @__PURE__ */ jsx("span", { children: detail2 }, detail2)) })
+    /* @__PURE__ */ jsxs("div", { className: styles$y.card, children: [
+      /* @__PURE__ */ jsxs("section", { className: styles$y.step, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$y.stepHead, children: [
+          /* @__PURE__ */ jsx("span", { className: styles$y.number, "aria-hidden": "true", children: "1" }),
+          /* @__PURE__ */ jsx("h2", { className: styles$y.stepTitle, children: "Download your return label" })
+        ] }),
+        /* @__PURE__ */ jsx("p", { className: styles$y.body, children: "Tap the button below to download your pre-paid return label" }),
+        ret.label_url && /* @__PURE__ */ jsxs(
+          "a",
+          {
+            className: styles$y.download,
+            href: ret.label_url,
+            target: "_blank",
+            rel: "noopener noreferrer",
+            children: [
+              "Download return label",
+              /* @__PURE__ */ jsx("span", { className: "visually-hidden", children: " (opens in a new tab)" })
+            ]
+          }
+        ),
+        ret.label_email && /* @__PURE__ */ jsxs("p", { className: styles$y.note, children: [
+          "You’ll receive a shipping label PDF to your email as well.",
+          /* @__PURE__ */ jsx("br", {}),
+          ret.label_email
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs("section", { className: styles$y.step2, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$y.stepHead, children: [
+          /* @__PURE__ */ jsx("span", { className: styles$y.number, "aria-hidden": "true", children: "2" }),
+          /* @__PURE__ */ jsx("h2", { className: styles$y.stepTitle, children: "Pack and ship the item" })
         ] }),
-        /* @__PURE__ */ jsx("span", { className: styles$w.linePrice, children: format(item2.line_total) })
+        /* @__PURE__ */ jsxs("p", { className: styles$y.body2, children: [
+          "Repackage the item securely and attach the return label to the outside of the package.",
+          /* @__PURE__ */ jsx("br", {}),
+          "Drop it off at your local carrier or post office."
+        ] })
       ] })
-    ] }, item2.line_ref)) })
+    ] }),
+    onDone && /* @__PURE__ */ jsx(Button, { variant: "primary", fullWidth: true, onClick: onDone, children: "Done" })
   ] });
 }
-function detailsOf$1(item2) {
-  const pairs = variantPairs(item2.attributes).map((p) => `${p.label}: ${p.value}`);
-  return item2.qty > 1 ? [...pairs, `Qty: ${item2.qty}`] : pairs;
-}
-function toPricing$1(order) {
-  return {
-    subtotal: order.totals.items,
-    shipping: order.totals.shipping,
-    tax: order.totals.tax,
-    total: order.totals.grand_total
-  };
-}
-function shortRef$1(orderRef) {
-  return orderRef.replace(/^ord_/, "");
+const page$3 = "_page_o44fl_8";
+const titles$1 = "_titles_o44fl_15";
+const title$i = "_title_o44fl_15";
+const subtitle$5 = "_subtitle_o44fl_30";
+const items$1 = "_items_o44fl_38";
+const item$1 = "_item_o44fl_38";
+const thumb = "_thumb_o44fl_53";
+const img = "_img_o44fl_63";
+const placeholder$6 = "_placeholder_o44fl_67";
+const meta$1 = "_meta_o44fl_72";
+const name$1 = "_name_o44fl_80";
+const attrs = "_attrs_o44fl_100";
+const price$2 = "_price_o44fl_115";
+const paid$1 = "_paid_o44fl_124";
+const was$2 = "_was_o44fl_132";
+const styles$x = {
+  page: page$3,
+  titles: titles$1,
+  title: title$i,
+  subtitle: subtitle$5,
+  items: items$1,
+  item: item$1,
+  thumb,
+  img,
+  placeholder: placeholder$6,
+  meta: meta$1,
+  name: name$1,
+  attrs,
+  price: price$2,
+  paid: paid$1,
+  was: was$2
+};
+function pctOff(item2) {
+  return item2.compare_at_unit_price ? discountPct(item2.unit_price, item2.compare_at_unit_price) : void 0;
 }
-function formatPlaced$1(iso, locale) {
-  return new Date(iso).toLocaleDateString(locale, {
+function ReturnTrackingView({ ret, locale: localeProp }) {
+  const locale = useLocale(localeProp);
+  const { format } = useMoney();
+  const reported = new Date(ret.reported_at).toLocaleDateString(locale, {
     day: "numeric",
     month: "short",
-    year: "numeric"
+    year: "numeric",
+    timeZone: "UTC"
   });
+  return /* @__PURE__ */ jsx(ShopSurface, { tone: "light", fill: true, children: /* @__PURE__ */ jsxs("div", { className: styles$x.page, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$x.titles, children: [
+      /* @__PURE__ */ jsx("h1", { className: styles$x.title, children: "Return in progress" }),
+      /* @__PURE__ */ jsx("p", { className: styles$x.subtitle, children: `Return #${ret.return_ref} · Reported ${reported}` })
+    ] }),
+    /* @__PURE__ */ jsx(OrderTimeline, { progress: ret.progress, locale }),
+    /* @__PURE__ */ jsx("ul", { className: styles$x.items, children: ret.items.map((item2) => /* @__PURE__ */ jsxs("li", { className: styles$x.item, children: [
+      /* @__PURE__ */ jsx("div", { className: styles$x.thumb, children: item2.image ? /* @__PURE__ */ jsx(ShopImage, { src: item2.image, alt: "", fill: true, sizes: "48px", className: styles$x.img }) : /* @__PURE__ */ jsx("div", { className: styles$x.placeholder, "aria-hidden": "true" }) }),
+      /* @__PURE__ */ jsxs("div", { className: styles$x.meta, children: [
+        /* @__PURE__ */ jsx("p", { className: styles$x.name, children: item2.title ?? item2.sku }),
+        (item2.attributes?.size || pctOff(item2)) && /* @__PURE__ */ jsxs("p", { className: styles$x.attrs, children: [
+          item2.attributes?.size && /* @__PURE__ */ jsx("span", { children: `Size: ${item2.attributes.size}` }),
+          pctOff(item2) !== void 0 && /* @__PURE__ */ jsx(SaleBadge, { pct: pctOff(item2) })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs("div", { className: styles$x.price, children: [
+        /* @__PURE__ */ jsx("span", { className: styles$x.paid, children: format(item2.unit_price) }),
+        item2.compare_at_unit_price && /* @__PURE__ */ jsx("span", { className: styles$x.was, children: format(item2.compare_at_unit_price) })
+      ] })
+    ] }, item2.line_ref)) })
+  ] }) });
 }
-function formatAddress$1(address) {
-  return [address.line1, address.line2, address.postcode, address.city, address.country].filter(Boolean).join(", ");
+function ReturnFlowView(props) {
+  return /* @__PURE__ */ jsx(ShopSurface, { tone: "light", fill: true, children: /* @__PURE__ */ jsx(ReturnFlowContent, { ...props }) });
 }
-const page$2 = "_page_8yxu9_6";
-const confirmed = "_confirmed_8yxu9_16";
-const title$g = "_title_8yxu9_22";
-const headline = "_headline_8yxu9_47";
-const subtitle$3 = "_subtitle_8yxu9_65";
-const lines$1 = "_lines_8yxu9_88";
-const line = "_line_8yxu9_88";
-const thumb = "_thumb_8yxu9_103";
-const image$8 = "_image_8yxu9_113";
-const placeholder$5 = "_placeholder_8yxu9_117";
-const lineBody = "_lineBody_8yxu9_122";
-const lineText = "_lineText_8yxu9_131";
-const lineTitle = "_lineTitle_8yxu9_141";
-const lineMeta = "_lineMeta_8yxu9_160";
-const linePrice = "_linePrice_8yxu9_175";
-const paid = "_paid_8yxu9_187";
-const was$1 = "_was_8yxu9_193";
-const card$2 = "_card_8yxu9_213";
-const cardTitle = "_cardTitle_8yxu9_221";
-const cardBody = "_cardBody_8yxu9_233";
-const summaryCard = "_summaryCard_8yxu9_205";
-const done = "_done_8yxu9_261";
-const styles$v = {
+function ReturnFlowContent({ orderRef, returnRef, onDone, locale }) {
+  const { api } = useShop();
+  const emit = useShopEvent();
+  const [order, setOrder] = useState(null);
+  const [ret, setRet] = useState(null);
+  const [state, setState] = useState("loading");
+  const [errorCode, setErrorCode] = useState(void 0);
+  const [busy, setBusy] = useState(false);
+  const load = useCallback(async () => {
+    setState("loading");
+    try {
+      if (returnRef) {
+        setRet(await api.returns.get(returnRef));
+      } else if (orderRef) {
+        setOrder(await api.orders.get(orderRef));
+      }
+      setState("ready");
+    } catch (err) {
+      setErrorCode(codeOf(err));
+      setState("error");
+    }
+  }, [api, orderRef, returnRef]);
+  useEffect(() => {
+    void load();
+  }, [load]);
+  async function submit(items2) {
+    if (!orderRef) return;
+    setBusy(true);
+    try {
+      const created = await api.orders.createReturn(orderRef, { items: items2 });
+      setRet(created);
+      emit({ type: "return_requested", orderRef, returnRef: created.return_ref });
+    } catch (err) {
+      setErrorCode(codeOf(err));
+      setState("error");
+      setBusy(false);
+    }
+  }
+  if (state === "loading") {
+    return /* @__PURE__ */ jsx(
+      "div",
+      {
+        style: {
+          padding: "var(--space-16)",
+          display: "flex",
+          flexDirection: "column",
+          gap: "var(--space-16)"
+        },
+        children: [0, 1, 2].map((i) => /* @__PURE__ */ jsx(Skeleton, { height: 88, radius: 8 }, i))
+      }
+    );
+  }
+  if (state === "error") {
+    return /* @__PURE__ */ jsx(ErrorState, { code: errorCode, onRetry: () => void load() });
+  }
+  if (ret) {
+    return ret.status === "reported" ? /* @__PURE__ */ jsx(ReturnLabelView, { ret, ...onDone ? { onDone } : {} }) : /* @__PURE__ */ jsx(ReturnTrackingView, { ret, ...locale ? { locale } : {} });
+  }
+  if (!order) {
+    return /* @__PURE__ */ jsx(ErrorState, { code: errorCode, onRetry: () => void load() });
+  }
+  if (!order.can_return) {
+    return /* @__PURE__ */ jsx(ErrorState, { code: "order_not_cancellable", onRetry: () => void load() });
+  }
+  return /* @__PURE__ */ jsx(ReturnItemsView, { order, onSubmit: (items2) => void submit(items2), busy });
+}
+const page$2 = "_page_1s8l9_6";
+const confirmed = "_confirmed_1s8l9_16";
+const title$h = "_title_1s8l9_22";
+const headline = "_headline_1s8l9_47";
+const subtitle$4 = "_subtitle_1s8l9_65";
+const done = "_done_1s8l9_87";
+const styles$w = {
   page: page$2,
   confirmed,
-  title: title$g,
+  title: title$h,
   headline,
-  subtitle: subtitle$3,
-  lines: lines$1,
-  line,
-  thumb,
-  image: image$8,
-  placeholder: placeholder$5,
-  lineBody,
-  lineText,
-  lineTitle,
-  lineMeta,
-  linePrice,
-  paid,
-  was: was$1,
-  card: card$2,
-  cardTitle,
-  cardBody,
-  summaryCard,
+  subtitle: subtitle$4,
   done
 };
-const SUMMARY_ROWS = [
-  { label: "Subtotal", key: "subtotal" },
-  { label: "Discount", key: "discount" },
-  { label: "Shipping", key: "shipping" },
-  { label: "Total", key: "total" }
-];
 function OrderConfirmationView(props) {
   return /* @__PURE__ */ jsx(ShopSurface, { tone: "light", fill: true, children: /* @__PURE__ */ jsx(OrderConfirmationContent, { ...props }) });
 }
@@ -6673,7 +7562,7 @@ function OrderConfirmationContent({ orderRef, locale: localeProp, onDone }) {
     void load();
   }, [load]);
   if (state === "loading") {
-    return /* @__PURE__ */ jsxs("div", { className: styles$v.page, children: [
+    return /* @__PURE__ */ jsxs("div", { className: styles$w.page, children: [
       /* @__PURE__ */ jsx(Skeleton, { height: 140, radius: 8 }),
       /* @__PURE__ */ jsx(Skeleton, { height: 72, radius: 8 }),
       /* @__PURE__ */ jsx(Skeleton, { height: 120, radius: 18 }),
@@ -6683,84 +7572,32 @@ function OrderConfirmationContent({ orderRef, locale: localeProp, onDone }) {
   if (state === "error" || !order) {
     return /* @__PURE__ */ jsx(ErrorState, { code: errorCode, onRetry: () => void load() });
   }
-  return /* @__PURE__ */ jsxs("div", { className: styles$v.page, children: [
-    /* @__PURE__ */ jsxs("section", { className: styles$v.confirmed, "aria-label": "Order confirmation", children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$v.title, children: [
-        /* @__PURE__ */ jsx("h1", { className: styles$v.headline, children: "Your order is confirmed" }),
-        order.email && /* @__PURE__ */ jsx("p", { className: styles$v.subtitle, children: `We’ve sent a confirmation to ${order.email}` })
+  return /* @__PURE__ */ jsxs("div", { className: styles$w.page, children: [
+    /* @__PURE__ */ jsxs("section", { className: styles$w.confirmed, "aria-label": "Order confirmation", children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$w.title, children: [
+        /* @__PURE__ */ jsx("h1", { className: styles$w.headline, children: "Your order is confirmed" }),
+        order.email && /* @__PURE__ */ jsx("p", { className: styles$w.subtitle, children: `We’ve sent a confirmation to ${order.email}` })
       ] }),
-      /* @__PURE__ */ jsx(OrderTimeline, { progress: order.progress, locale })
-    ] }),
-    /* @__PURE__ */ jsx("ul", { className: styles$v.lines, "aria-label": "Items", children: order.items.map((item2) => /* @__PURE__ */ jsx(ConfirmationLine, { item: item2 }, item2.line_ref)) }),
-    /* @__PURE__ */ jsxs("section", { className: styles$v.card, "aria-label": "Shipping address", children: [
-      /* @__PURE__ */ jsx("h2", { className: styles$v.cardTitle, children: "Shipping address" }),
-      /* @__PURE__ */ jsx("p", { className: styles$v.cardBody, children: formatAddress(order.ship_to) })
-    ] }),
-    /* @__PURE__ */ jsxs("section", { className: [styles$v.card, styles$v.summaryCard].join(" "), "aria-label": "Order summary", children: [
-      /* @__PURE__ */ jsx("h2", { className: styles$v.cardTitle, children: "Order summary" }),
       /* @__PURE__ */ jsx(
-        OrderSummary,
+        OrderTimeline,
         {
-          pricing: toPricing(order),
-          rows: rowsFor(order),
-          discount: order.totals.discount
+          progress: order.progress,
+          ...order.estimated_delivery ? { estimatedDelivery: order.estimated_delivery } : {},
+          locale
         }
       )
     ] }),
-    onDone && /* @__PURE__ */ jsx(Button, { variant: "secondary", fullWidth: true, className: styles$v.done, onClick: onDone, children: "Done" })
-  ] });
-}
-function ConfirmationLine({ item: item2 }) {
-  const { format } = useMoney();
-  const compareAt2 = item2.compare_at_unit_price;
-  const pct = compareAt2 ? discountPct(item2.unit_price, compareAt2) : void 0;
-  const details2 = detailsOf(item2);
-  return /* @__PURE__ */ jsxs("li", { className: styles$v.line, children: [
-    /* @__PURE__ */ jsx("div", { className: styles$v.thumb, children: item2.image ? /* @__PURE__ */ jsx(ShopImage, { src: item2.image, alt: "", fill: true, sizes: "48px", className: styles$v.image }) : /* @__PURE__ */ jsx("div", { className: styles$v.placeholder, "aria-hidden": "true" }) }),
-    /* @__PURE__ */ jsxs("div", { className: styles$v.lineBody, children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$v.lineText, children: [
-        /* @__PURE__ */ jsx("span", { className: styles$v.lineTitle, children: item2.title ?? item2.sku }),
-        /* @__PURE__ */ jsxs("span", { className: styles$v.lineMeta, children: [
-          details2.map((detail2) => /* @__PURE__ */ jsx("span", { children: detail2 }, detail2)),
-          pct !== void 0 && /* @__PURE__ */ jsx(SaleBadge, { pct })
-        ] })
-      ] }),
-      /* @__PURE__ */ jsxs("span", { className: styles$v.linePrice, children: [
-        /* @__PURE__ */ jsx("span", { className: styles$v.paid, children: format(item2.line_total) }),
-        compareAt2 && /* @__PURE__ */ jsxs("span", { className: styles$v.was, children: [
-          /* @__PURE__ */ jsx("span", { className: "visually-hidden", children: `Was ${format(compareAt2)}` }),
-          /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: format(compareAt2) })
-        ] })
-      ] })
-    ] })
+    /* @__PURE__ */ jsx(OrderLines, { order }),
+    /* @__PURE__ */ jsx(ShippingAddressCard, { order }),
+    /* @__PURE__ */ jsx(OrderSummaryCard, { order }),
+    onDone && /* @__PURE__ */ jsx(Button, { variant: "secondary", fullWidth: true, className: styles$w.done, onClick: onDone, children: "Done" })
   ] });
 }
-function detailsOf(item2) {
-  const pairs = variantPairs(item2.attributes).map((p) => `${p.label}: ${p.value}`);
-  return item2.qty > 1 ? [...pairs, `Qty: ${item2.qty}`] : pairs;
-}
-function rowsFor(order) {
-  if (order.totals.tax.amount === 0) return SUMMARY_ROWS;
-  return SUMMARY_ROWS.flatMap(
-    (row2) => row2.key === "shipping" ? [row2, { label: "Tax", key: "tax" }] : [row2]
-  );
-}
-function toPricing(order) {
-  return {
-    subtotal: order.totals.items,
-    shipping: order.totals.shipping,
-    tax: order.totals.tax,
-    total: order.totals.grand_total
-  };
-}
-function formatAddress(address) {
-  return [address.line1, address.line2, address.postcode, address.city, address.country].filter(Boolean).join(", ");
-}
 const badge$2 = "_badge_ghd02_6";
 const progress = "_progress_ghd02_22";
 const delivered = "_delivered_ghd02_27";
 const cancelled = "_cancelled_ghd02_32";
-const styles$u = {
+const styles$v = {
   badge: badge$2,
   progress,
   delivered,
@@ -6780,28 +7617,28 @@ const TONE = {
   delivered: "delivered",
   cancelled: "cancelled"
 };
-function OrderStatusBadge({ status: status2 }) {
-  const label2 = LABEL[status2] ?? status2.replace(/_/g, " ");
-  const tone = TONE[status2] ?? "progress";
-  return /* @__PURE__ */ jsx("span", { className: [styles$u.badge, styles$u[tone]].join(" "), children: label2 });
-}
-const page$1 = "_page_y686q_2";
-const empty = "_empty_y686q_11";
-const cta$1 = "_cta_y686q_22";
-const card$1 = "_card_y686q_45";
-const tappable = "_tappable_y686q_60";
-const head$1 = "_head_y686q_69";
-const heading = "_heading_y686q_77";
-const title$f = "_title_y686q_86";
-const date = "_date_y686q_97";
-const bottom$1 = "_bottom_y686q_102";
-const strip = "_strip_y686q_110";
-const tile$2 = "_tile_y686q_115";
-const image$7 = "_image_y686q_125";
-const placeholder$4 = "_placeholder_y686q_129";
-const more = "_more_y686q_136";
-const chevron$3 = "_chevron_y686q_149";
-const styles$t = {
+function OrderStatusBadge({ status }) {
+  const label2 = LABEL[status] ?? status.replace(/_/g, " ");
+  const tone = TONE[status] ?? "progress";
+  return /* @__PURE__ */ jsx("span", { className: [styles$v.badge, styles$v[tone]].join(" "), children: label2 });
+}
+const page$1 = "_page_6xodo_2";
+const empty = "_empty_6xodo_22";
+const cta$1 = "_cta_6xodo_32";
+const card$1 = "_card_6xodo_55";
+const tappable = "_tappable_6xodo_70";
+const head$1 = "_head_6xodo_79";
+const heading = "_heading_6xodo_87";
+const title$g = "_title_6xodo_96";
+const date = "_date_6xodo_115";
+const bottom$1 = "_bottom_6xodo_120";
+const strip = "_strip_6xodo_128";
+const tile$2 = "_tile_6xodo_133";
+const image$8 = "_image_6xodo_143";
+const placeholder$5 = "_placeholder_6xodo_147";
+const more = "_more_6xodo_154";
+const chevron$3 = "_chevron_6xodo_167";
+const styles$u = {
   page: page$1,
   empty,
   cta: cta$1,
@@ -6809,28 +7646,25 @@ const styles$t = {
   tappable,
   head: head$1,
   heading,
-  title: title$f,
+  title: title$g,
   date,
   bottom: bottom$1,
   strip,
   tile: tile$2,
-  image: image$7,
-  placeholder: placeholder$4,
+  image: image$8,
+  placeholder: placeholder$5,
   more,
   chevron: chevron$3
 };
 const TILES = 3;
 function Chevron() {
-  return /* @__PURE__ */ jsx("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx("g", { transform: "translate(8 4.82)", children: /* @__PURE__ */ jsx(
     "path",
     {
-      d: "M9 5.5l6.5 6.5L9 18.5",
-      stroke: "currentColor",
-      strokeWidth: "1.8",
-      strokeLinecap: "round",
-      strokeLinejoin: "round"
+      d: "M0.292893 0.292893C0.683418 -0.0976311 1.31643 -0.0976311 1.70696 0.292893L7.70696 6.29289C8.09748 6.68342 8.09748 7.31643 7.70696 7.70696L1.70696 13.707C1.31643 14.0975 0.683417 14.0975 0.292893 13.707C-0.0976311 13.3164 -0.0976311 12.6834 0.292893 12.2929L5.58586 6.99992L0.292893 1.70696C-0.0976311 1.31643 -0.0976311 0.683418 0.292893 0.292893Z",
+      fill: "currentColor"
     }
-  ) });
+  ) }) });
 }
 function OrderListView(props) {
   return /* @__PURE__ */ jsx(ShopSurface, { tone: "light", fill: true, children: /* @__PURE__ */ jsx(OrderListContent, { ...props }) });
@@ -6856,7 +7690,7 @@ function OrderListContent({ onOpenOrder, onStartShopping, locale: localeProp })
     void load();
   }, [load]);
   if (state === "loading") {
-    return /* @__PURE__ */ jsxs("div", { className: styles$t.page, children: [
+    return /* @__PURE__ */ jsxs("div", { className: styles$u.page, children: [
       /* @__PURE__ */ jsx(Skeleton, { height: 148, radius: 12 }),
       /* @__PURE__ */ jsx(Skeleton, { height: 148, radius: 12 }),
       /* @__PURE__ */ jsx(Skeleton, { height: 148, radius: 12 })
@@ -6866,18 +7700,18 @@ function OrderListContent({ onOpenOrder, onStartShopping, locale: localeProp })
     return /* @__PURE__ */ jsx(ErrorState, { code: errorCode, onRetry: () => void load() });
   }
   if (orders2.length === 0) {
-    return /* @__PURE__ */ jsx("div", { className: styles$t.empty, children: /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ jsx("div", { className: styles$u.empty, children: /* @__PURE__ */ jsx(
       EmptyState,
       {
         title: "Nothing here yet",
         body: "Your orders will show up here once you've shopped.",
         ...onStartShopping ? {
-          action: /* @__PURE__ */ jsx("button", { type: "button", className: styles$t.cta, onClick: onStartShopping, children: "Find my fit" })
+          action: /* @__PURE__ */ jsx("button", { type: "button", className: styles$u.cta, onClick: onStartShopping, children: "Continue shopping" })
         } : {}
       }
     ) });
   }
-  return /* @__PURE__ */ jsx("ul", { className: styles$t.page, children: orders2.map((order) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx("ul", { className: styles$u.page, children: orders2.map((order) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
     OrderCard,
     {
       order,
@@ -6891,28 +7725,28 @@ function OrderCard({
   locale,
   onOpen
 }) {
-  const body2 = /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsxs("div", { className: styles$t.head, children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$t.heading, children: [
-        /* @__PURE__ */ jsx("span", { className: styles$t.title, children: `Order #${shortRef(order.order_ref)}` }),
-        /* @__PURE__ */ jsx("span", { className: styles$t.date, children: formatPlaced(order.placed_at, locale) })
+  const body3 = /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$u.head, children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$u.heading, children: [
+        /* @__PURE__ */ jsx("span", { className: styles$u.title, children: `Order #${shortRef(order.order_ref)}` }),
+        /* @__PURE__ */ jsx("span", { className: styles$u.date, children: formatPlaced(order.placed_at, locale) })
       ] }),
       /* @__PURE__ */ jsx(OrderStatusBadge, { status: order.status })
     ] }),
-    /* @__PURE__ */ jsxs("div", { className: styles$t.bottom, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$u.bottom, children: [
       /* @__PURE__ */ jsx(Thumbnails, { order }),
-      onOpen && /* @__PURE__ */ jsx("span", { className: styles$t.chevron, children: /* @__PURE__ */ jsx(Chevron, {}) })
+      onOpen && /* @__PURE__ */ jsx("span", { className: styles$u.chevron, children: /* @__PURE__ */ jsx(Chevron, {}) })
     ] })
   ] });
-  if (!onOpen) return /* @__PURE__ */ jsx("div", { className: styles$t.card, children: body2 });
+  if (!onOpen) return /* @__PURE__ */ jsx("div", { className: styles$u.card, children: body3 });
   return /* @__PURE__ */ jsx(
     "button",
     {
       type: "button",
-      className: [styles$t.card, styles$t.tappable].join(" "),
+      className: [styles$u.card, styles$u.tappable].join(" "),
       onClick: onOpen,
       "aria-label": `Order ${shortRef(order.order_ref)}, ${order.headline}`,
-      children: body2
+      children: body3
     }
   );
 }
@@ -6921,13 +7755,13 @@ function Thumbnails({ order }) {
   const hidden = order.item_count - TILES + 1;
   const overflow = images.length >= TILES && hidden > 1 ? hidden : 0;
   if (images.length === 0) {
-    return /* @__PURE__ */ jsx("div", { className: styles$t.strip, children: /* @__PURE__ */ jsx("div", { className: [styles$t.tile, styles$t.placeholder].join(" "), "aria-hidden": "true" }) });
+    return /* @__PURE__ */ jsx("div", { className: styles$u.strip, children: /* @__PURE__ */ jsx("div", { className: [styles$u.tile, styles$u.placeholder].join(" "), "aria-hidden": "true" }) });
   }
-  return /* @__PURE__ */ jsx("div", { className: styles$t.strip, children: images.map((src, i) => {
+  return /* @__PURE__ */ jsx("div", { className: styles$u.strip, children: images.map((src, i) => {
     const last = i === images.length - 1;
-    return /* @__PURE__ */ jsxs("div", { className: styles$t.tile, children: [
-      /* @__PURE__ */ jsx(ShopImage, { src, alt: "", fill: true, sizes: "56px", className: styles$t.image }),
-      overflow > 0 && last && /* @__PURE__ */ jsxs("span", { className: styles$t.more, children: [
+    return /* @__PURE__ */ jsxs("div", { className: styles$u.tile, children: [
+      /* @__PURE__ */ jsx(ShopImage, { src, alt: "", fill: true, sizes: "56px", className: styles$u.image }),
+      overflow > 0 && last && /* @__PURE__ */ jsxs("span", { className: styles$u.more, children: [
         /* @__PURE__ */ jsxs("span", { "aria-hidden": "true", children: [
           "+",
           overflow
@@ -6945,32 +7779,32 @@ function formatPlaced(iso, locale) {
   const day = date2.toLocaleDateString(locale, { day: "numeric", month: "short" });
   return `${day}, ${date2.toLocaleDateString(locale, { year: "numeric" })}`;
 }
-const tile$1 = "_tile_1u9l8_3";
-const media$2 = "_media_1u9l8_11";
-const image$6 = "_image_1u9l8_21";
-const placeholder$3 = "_placeholder_1u9l8_25";
-const topBadge = "_topBadge_1u9l8_33";
-const saleBadge$1 = "_saleBadge_1u9l8_56";
-const oos$2 = "_oos_1u9l8_63";
-const bottom = "_bottom_1u9l8_88";
-const titlePrice$1 = "_titlePrice_1u9l8_1";
-const title$e = "_title_1u9l8_1";
-const swatches = "_swatches_1u9l8_119";
-const swatch = "_swatch_1u9l8_119";
-const swatchActive = "_swatchActive_1u9l8_132";
-const swatchDot = "_swatchDot_1u9l8_136";
-const large = "_large_1u9l8_147";
-const styles$s = {
+const tile$1 = "_tile_1io44_7";
+const media$2 = "_media_1io44_15";
+const image$7 = "_image_1io44_25";
+const placeholder$4 = "_placeholder_1io44_29";
+const topBadge = "_topBadge_1io44_37";
+const saleBadge$2 = "_saleBadge_1io44_78";
+const oos$3 = "_oos_1io44_86";
+const bottom = "_bottom_1io44_113";
+const titlePrice$1 = "_titlePrice_1io44_100";
+const title$f = "_title_1io44_5";
+const swatches = "_swatches_1io44_179";
+const swatch = "_swatch_1io44_179";
+const swatchActive = "_swatchActive_1io44_196";
+const swatchDot = "_swatchDot_1io44_200";
+const large = "_large_1io44_211";
+const styles$t = {
   tile: tile$1,
   media: media$2,
-  image: image$6,
-  placeholder: placeholder$3,
+  image: image$7,
+  placeholder: placeholder$4,
   topBadge,
-  saleBadge: saleBadge$1,
-  oos: oos$2,
+  saleBadge: saleBadge$2,
+  oos: oos$3,
   bottom,
   titlePrice: titlePrice$1,
-  title: title$e,
+  title: title$f,
   swatches,
   swatch,
   swatchActive,
@@ -6987,9 +7821,9 @@ function ProductTile({ product, priority, size = "default" }) {
     ShopLink,
     {
       to: `/product/${encodeURIComponent(product.sku)}`,
-      className: [styles$s.tile, size === "large" ? styles$s.large : ""].join(" "),
+      className: [styles$t.tile, size === "large" ? styles$t.large : ""].join(" "),
       children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$s.media, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$t.media, children: [
           image2 ? /* @__PURE__ */ jsx(
             ShopImage,
             {
@@ -6997,17 +7831,17 @@ function ProductTile({ product, priority, size = "default" }) {
               alt: product.title,
               fill: true,
               sizes: size === "large" ? "(max-width: 480px) 100vw, 480px" : "(max-width: 480px) 45vw, 200px",
-              className: styles$s.image,
+              className: styles$t.image,
               priority
             }
-          ) : /* @__PURE__ */ jsx("div", { className: styles$s.placeholder, "aria-hidden": "true" }),
-          anyInStock && topBadge2 && /* @__PURE__ */ jsx("span", { className: styles$s.topBadge, children: topBadge2 }),
-          anyInStock && pct !== void 0 && /* @__PURE__ */ jsx("span", { className: styles$s.saleBadge, children: /* @__PURE__ */ jsx(SaleBadge, { pct }) }),
-          !anyInStock && /* @__PURE__ */ jsx("span", { className: styles$s.oos, children: "Out of stock" })
+          ) : /* @__PURE__ */ jsx("div", { className: styles$t.placeholder, "aria-hidden": "true" }),
+          anyInStock && topBadge2 && /* @__PURE__ */ jsx("span", { className: styles$t.topBadge, children: topBadge2 }),
+          anyInStock && pct !== void 0 && /* @__PURE__ */ jsx("span", { className: styles$t.saleBadge, children: /* @__PURE__ */ jsx(SaleBadge, { pct }) }),
+          !anyInStock && /* @__PURE__ */ jsx("span", { className: styles$t.oos, children: "Out of stock" })
         ] }),
-        /* @__PURE__ */ jsxs("div", { className: styles$s.bottom, children: [
-          /* @__PURE__ */ jsxs("div", { className: styles$s.titlePrice, children: [
-            /* @__PURE__ */ jsx("span", { className: styles$s.title, children: product.title }),
+        /* @__PURE__ */ jsxs("div", { className: styles$t.bottom, children: [
+          /* @__PURE__ */ jsxs("div", { className: styles$t.titlePrice, children: [
+            /* @__PURE__ */ jsx("span", { className: styles$t.title, children: product.title }),
             /* @__PURE__ */ jsx(
               PriceBlock,
               {
@@ -7019,11 +7853,11 @@ function ProductTile({ product, priority, size = "default" }) {
               }
             )
           ] }),
-          swatches2.length > 0 && /* @__PURE__ */ jsx("div", { className: styles$s.swatches, "aria-hidden": "true", children: swatches2.map((c, i) => /* @__PURE__ */ jsx(
+          swatches2.length > 0 && /* @__PURE__ */ jsx("div", { className: styles$t.swatches, "aria-hidden": "true", children: swatches2.map((c, i) => /* @__PURE__ */ jsx(
             "span",
             {
-              className: [styles$s.swatch, i === 0 ? styles$s.swatchActive : ""].join(" "),
-              children: /* @__PURE__ */ jsx("span", { className: styles$s.swatchDot, style: { background: swatchColour(c.value) } })
+              className: [styles$t.swatch, i === 0 ? styles$t.swatchActive : ""].join(" "),
+              children: /* @__PURE__ */ jsx("span", { className: styles$t.swatchDot, style: { background: swatchColour(c.value) } })
             },
             c.value
           )) })
@@ -7032,6 +7866,72 @@ function ProductTile({ product, priority, size = "default" }) {
     }
   );
 }
+const section$3 = "_section_1n5an_5";
+const title$e = "_title_1n5an_17";
+const link = "_link_1n5an_26";
+const track$4 = "_track_1n5an_38";
+const frame = "_frame_1n5an_58";
+const image$6 = "_image_1n5an_69";
+const placeholder$3 = "_placeholder_1n5an_73";
+const saleBadge$1 = "_saleBadge_1n5an_85";
+const oos$2 = "_oos_1n5an_93";
+const caption = "_caption_1n5an_109";
+const name = "_name_1n5an_122";
+const price$1 = "_price_1n5an_135";
+const paid = "_paid_1n5an_144";
+const was$1 = "_was_1n5an_150";
+const styles$s = {
+  section: section$3,
+  title: title$e,
+  link,
+  track: track$4,
+  frame,
+  image: image$6,
+  placeholder: placeholder$3,
+  saleBadge: saleBadge$1,
+  oos: oos$2,
+  caption,
+  name,
+  price: price$1,
+  paid,
+  was: was$1
+};
+function ProductGallery({ title: title2, product }) {
+  const { format } = useMoney();
+  const pct = product.compare_at ? discountPct(product.price, product.compare_at) : void 0;
+  const inStock = product.variants.some((v) => v.in_stock);
+  const images = product.media.length > 0 ? product.media : [void 0];
+  return /* @__PURE__ */ jsxs("section", { className: styles$s.section, "aria-labelledby": `gallery-${product.sku}`, children: [
+    /* @__PURE__ */ jsx("h2", { className: styles$s.title, id: `gallery-${product.sku}`, children: title2 }),
+    /* @__PURE__ */ jsxs(ShopLink, { to: `/product/${encodeURIComponent(product.sku)}`, className: styles$s.link, children: [
+      /* @__PURE__ */ jsx("ul", { className: styles$s.track, "aria-label": `${product.title} photographs`, children: images.map((src, i) => /* @__PURE__ */ jsxs("li", { className: styles$s.frame, children: [
+        src ? /* @__PURE__ */ jsx(
+          ShopImage,
+          {
+            src,
+            alt: "",
+            fill: true,
+            sizes: "165px",
+            className: styles$s.image,
+            ...i === 0 ? { priority: true } : {}
+          }
+        ) : /* @__PURE__ */ jsx("div", { className: styles$s.placeholder, "aria-hidden": "true" }),
+        i === 0 && inStock && pct !== void 0 && /* @__PURE__ */ jsx("span", { className: styles$s.saleBadge, children: /* @__PURE__ */ jsx(SaleBadge, { pct }) }),
+        i === 0 && !inStock && /* @__PURE__ */ jsx("span", { className: styles$s.oos, children: "Out of stock" })
+      ] }, src ?? i)) }),
+      /* @__PURE__ */ jsxs("div", { className: styles$s.caption, children: [
+        /* @__PURE__ */ jsx("span", { className: styles$s.name, children: product.title }),
+        /* @__PURE__ */ jsxs("span", { className: styles$s.price, children: [
+          /* @__PURE__ */ jsx("span", { className: styles$s.paid, children: format(product.price) }),
+          product.compare_at && /* @__PURE__ */ jsxs("span", { className: styles$s.was, children: [
+            /* @__PURE__ */ jsx("span", { className: "visually-hidden", children: `Was ${format(product.compare_at)}` }),
+            /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: format(product.compare_at) })
+          ] })
+        ] })
+      ] })
+    ] })
+  ] });
+}
 const bar$1 = "_bar_fn0g9_1";
 const chips$1 = "_chips_fn0g9_8";
 const chip$1 = "_chip_fn0g9_8";
@@ -7133,16 +8033,16 @@ function ProductGrid({
     /* @__PURE__ */ jsx("div", { ref: sentinelRef, "aria-hidden": "true" })
   ] });
 }
-const rail = "_rail_5z5e9_2";
-const header$6 = "_header_5z5e9_9";
-const title$d = "_title_5z5e9_16";
-const seeAll = "_seeAll_5z5e9_22";
-const track$3 = "_track_5z5e9_28";
-const item = "_item_5z5e9_45";
-const inset = "_inset_5z5e9_57";
+const rail = "_rail_11l7h_7";
+const header$5 = "_header_11l7h_14";
+const title$d = "_title_11l7h_21";
+const seeAll = "_seeAll_11l7h_27";
+const track$3 = "_track_11l7h_33";
+const item = "_item_11l7h_50";
+const inset = "_inset_11l7h_62";
 const styles$p = {
   rail,
-  header: header$6,
+  header: header$5,
   title: title$d,
   seeAll,
   track: track$3,
@@ -7159,71 +8059,26 @@ function RailCarousel({ title: title2, products, seeAllTo, inset: inset2 }) {
     /* @__PURE__ */ jsx("ul", { className: styles$p.track, children: products.map((product, i) => /* @__PURE__ */ jsx("li", { className: styles$p.item, children: /* @__PURE__ */ jsx(ProductTile, { product, priority: i < 2 }) }, product.sku)) })
   ] });
 }
-const FOCUSABLE = 'a[href], button:not([disabled]), textarea, input, select, [tabindex]:not([tabindex="-1"])';
-function useModalDialog(open, onClose, ref) {
-  const handleKeyDown = useCallback(
-    (e) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onClose();
-        return;
-      }
-      if (e.key !== "Tab") return;
-      const dialog = ref.current;
-      if (!dialog) return;
-      const focusables = Array.from(dialog.querySelectorAll(FOCUSABLE)).filter(
-        (el) => el.offsetParent !== null || el === document.activeElement
-      );
-      if (focusables.length === 0) {
-        e.preventDefault();
-        return;
-      }
-      const first = focusables[0];
-      const last = focusables[focusables.length - 1];
-      if (e.shiftKey && document.activeElement === first) {
-        e.preventDefault();
-        last.focus();
-      } else if (!e.shiftKey && document.activeElement === last) {
-        e.preventDefault();
-        first.focus();
-      }
-    },
-    [onClose, ref]
-  );
-  useEffect(() => {
-    if (!open) return;
-    const previouslyFocused = document.activeElement;
-    document.addEventListener("keydown", handleKeyDown);
-    ref.current?.querySelector(FOCUSABLE)?.focus();
-    const { overflow } = document.body.style;
-    document.body.style.overflow = "hidden";
-    return () => {
-      document.removeEventListener("keydown", handleKeyDown);
-      document.body.style.overflow = overflow;
-      previouslyFocused?.focus?.();
-    };
-  }, [open, handleKeyDown, ref]);
-}
 const overlay$2 = "_overlay_s4eai_1";
 const scrim$4 = "_scrim_s4eai_10";
 const sheet$2 = "_sheet_s4eai_16";
 const grabArea = "_grabArea_s4eai_41";
-const grabber$1 = "_grabber_s4eai_51";
-const header$5 = "_header_s4eai_59";
+const grabber = "_grabber_s4eai_51";
+const header$4 = "_header_s4eai_59";
 const title$c = "_title_s4eai_67";
-const close$2 = "_close_s4eai_71";
-const body$3 = "_body_s4eai_84";
+const close$1 = "_close_s4eai_71";
+const body$4 = "_body_s4eai_84";
 const footer = "_footer_s4eai_90";
 const styles$o = {
   overlay: overlay$2,
   scrim: scrim$4,
   sheet: sheet$2,
   grabArea,
-  grabber: grabber$1,
-  header: header$5,
+  grabber,
+  header: header$4,
   title: title$c,
-  close: close$2,
-  body: body$3,
+  close: close$1,
+  body: body$4,
   footer
 };
 const DISMISS_THRESHOLD_PX = 96;
@@ -7298,6 +8153,18 @@ function BottomSheet({ open, onClose, title: title2, children, footer: footer2 }
     )
   ] });
 }
+const LOW_STOCK_THRESHOLD = 5;
+function isLowStock(available) {
+  return available !== void 0 && available > 0 && available <= LOW_STOCK_THRESHOLD;
+}
+function lowStockLabel(available) {
+  return `Only ${available} left`;
+}
+let idCounter = 0;
+function useStableId(prefix) {
+  const [id] = useState(() => `${prefix}-${idCounter += 1}`);
+  return id;
+}
 const wrap$1 = "_wrap_1rmip_1";
 const stepper = "_stepper_1rmip_10";
 const cap = "_cap_1rmip_23";
@@ -7310,11 +8177,6 @@ const styles$n = {
   button,
   value: value$1
 };
-let idCounter = 0;
-function useStableId(prefix) {
-  const [id] = useState(() => `${prefix}-${idCounter += 1}`);
-  return id;
-}
 function TrashIcon() {
   return /* @__PURE__ */ jsx("svg", { width: "20", height: "20", viewBox: "0 0 20 20", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsxs("g", { transform: "translate(3.8633 3.227)", fill: "currentColor", children: [
     /* @__PURE__ */ jsx("path", { d: "M4.92871 5.4375C5.31531 5.4375 5.62891 5.7511 5.62891 6.1377V9.7627C5.62841 10.1489 5.315 10.4619 4.92871 10.4619C4.54242 10.4619 4.22901 10.1489 4.22852 9.7627V6.1377C4.22852 5.7511 4.54211 5.4375 4.92871 5.4375Z" }),
@@ -7347,9 +8209,17 @@ function PlusIcon() {
     }
   ) }) });
 }
-function QtyStepper({ qty, max, onChange, onRemove, disabled: disabled2 }) {
-  const capId = useStableId("qty-cap");
+function QtyStepper({
+  qty,
+  max,
+  onChange,
+  onRemove,
+  disabled: disabled2,
+  capDescribedBy
+}) {
+  const ownCapId = useStableId("qty-cap");
   const atMax = max !== void 0 && qty >= max;
+  const capId = capDescribedBy ?? ownCapId;
   const willDelete = qty <= 1;
   function decrement() {
     if (willDelete) {
@@ -7388,28 +8258,34 @@ function QtyStepper({ qty, max, onChange, onRemove, disabled: disabled2 }) {
         }
       )
     ] }),
-    atMax && /* @__PURE__ */ jsx("span", { id: capId, className: styles$n.cap, role: "status", children: max === 0 ? "Out of stock" : `Only ${max} left` })
+    atMax && capDescribedBy === void 0 && /* @__PURE__ */ jsx("span", { id: ownCapId, className: styles$n.cap, role: "status", children: max === 0 ? "Out of stock" : lowStockLabel(max) })
   ] });
 }
-const row$5 = "_row_1xbbn_1";
-const pending = "_pending_1xbbn_7";
-const media$1 = "_media_1xbbn_11";
-const image$5 = "_image_1xbbn_21";
-const placeholder$2 = "_placeholder_1xbbn_25";
-const saleBadge = "_saleBadge_1xbbn_31";
-const oos$1 = "_oos_1xbbn_45";
-const info$1 = "_info_1xbbn_58";
-const head = "_head_1xbbn_66";
-const meta = "_meta_1xbbn_73";
-const title$b = "_title_1xbbn_80";
-const details = "_details_1xbbn_92";
-const detail = "_detail_1xbbn_92";
-const price = "_price_1xbbn_106";
-const amount = "_amount_1xbbn_114";
-const was = "_was_1xbbn_120";
+const line = "_line_1s2s6_6";
+const row$5 = "_row_1s2s6_12";
+const pending = "_pending_1s2s6_18";
+const labels = "_labels_1s2s6_24";
+const lowStock = "_lowStock_1s2s6_39";
+const media$1 = "_media_1s2s6_49";
+const image$5 = "_image_1s2s6_59";
+const placeholder$2 = "_placeholder_1s2s6_63";
+const saleBadge = "_saleBadge_1s2s6_76";
+const oos$1 = "_oos_1s2s6_91";
+const info$1 = "_info_1s2s6_104";
+const head = "_head_1s2s6_112";
+const meta = "_meta_1s2s6_119";
+const title$b = "_title_1s2s6_134";
+const details = "_details_1s2s6_152";
+const detail = "_detail_1s2s6_152";
+const price = "_price_1s2s6_171";
+const amount = "_amount_1s2s6_179";
+const was = "_was_1s2s6_188";
 const styles$m = {
+  line,
   row: row$5,
   pending,
+  labels,
+  lowStock,
   media: media$1,
   image: image$5,
   placeholder: placeholder$2,
@@ -7430,7 +8306,7 @@ function CartLineItem({
   title: title2,
   image: image2,
   compareAt: compareAt2,
-  discountPct: discountPct2,
+  discountPct: discountPct$1,
   maxQty,
   onQtyChange,
   onRemove,
@@ -7440,38 +8316,47 @@ function CartLineItem({
   const displayTitle = title2 ?? item2.title ?? item2.sku;
   const displayImage = image2 ?? item2.image;
   const pairs = variantPairs(item2.attributes);
-  const soldOut = item2.available === 0;
-  return /* @__PURE__ */ jsxs("div", { className: [styles$m.row, pending2 ? styles$m.pending : ""].join(" "), children: [
-    /* @__PURE__ */ jsxs("div", { className: styles$m.media, children: [
-      displayImage ? /* @__PURE__ */ jsx(ShopImage, { src: displayImage, alt: "", fill: true, sizes: "100px", className: styles$m.image }) : /* @__PURE__ */ jsx("div", { className: styles$m.placeholder, "aria-hidden": "true" }),
-      soldOut ? /* @__PURE__ */ jsx("span", { className: styles$m.oos, children: "Out of stock" }) : discountPct2 !== void 0 && /* @__PURE__ */ jsx("span", { className: styles$m.saleBadge, children: /* @__PURE__ */ jsx(SaleBadge, { pct: discountPct2 }) })
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: styles$m.info, children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$m.head, children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$m.meta, children: [
-          /* @__PURE__ */ jsx("span", { className: styles$m.title, children: displayTitle }),
-          pairs.length > 0 && /* @__PURE__ */ jsx("div", { className: styles$m.details, children: pairs.map(({ key, label: label2, value: value2 }) => /* @__PURE__ */ jsxs("span", { className: styles$m.detail, children: [
-            label2,
-            ": ",
-            value2
-          ] }, key)) })
-        ] }),
-        /* @__PURE__ */ jsxs("div", { className: styles$m.price, children: [
-          /* @__PURE__ */ jsx("span", { className: styles$m.amount, children: format(item2.line_total) }),
-          compareAt2 && /* @__PURE__ */ jsx("span", { className: styles$m.was, children: format(compareAt2) })
-        ] })
+  const available = item2.available;
+  const soldOut = available === 0;
+  const lowStock2 = isLowStock(available);
+  const pct = discountPct$1 ?? (compareAt2 ? discountPct(item2.unit_price, compareAt2) : void 0);
+  const noticeId = useStableId("cart-line-stock");
+  const notice = lowStock2 || soldOut ? noticeId : void 0;
+  return /* @__PURE__ */ jsxs("div", { className: [styles$m.line, pending2 ? styles$m.pending : ""].join(" "), children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$m.row, children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$m.media, children: [
+        displayImage ? /* @__PURE__ */ jsx(ShopImage, { src: displayImage, alt: "", fill: true, sizes: "100px", className: styles$m.image }) : /* @__PURE__ */ jsx("div", { className: styles$m.placeholder, "aria-hidden": "true" }),
+        soldOut ? /* @__PURE__ */ jsx("span", { className: styles$m.oos, id: noticeId, children: "Out of stock" }) : pct !== void 0 && /* @__PURE__ */ jsx("span", { className: styles$m.saleBadge, children: /* @__PURE__ */ jsx(SaleBadge, { pct }) })
       ] }),
-      /* @__PURE__ */ jsx(
-        QtyStepper,
-        {
-          qty: item2.qty,
-          max: maxQty,
-          onChange: onQtyChange,
-          onRemove,
-          disabled: pending2
-        }
-      )
-    ] })
+      /* @__PURE__ */ jsxs("div", { className: styles$m.info, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$m.head, children: [
+          /* @__PURE__ */ jsxs("div", { className: styles$m.meta, children: [
+            /* @__PURE__ */ jsx("span", { className: styles$m.title, children: displayTitle }),
+            pairs.length > 0 && /* @__PURE__ */ jsx("div", { className: styles$m.details, children: pairs.map(({ key, label: label2, value: value2 }) => /* @__PURE__ */ jsxs("span", { className: styles$m.detail, children: [
+              label2,
+              ": ",
+              value2
+            ] }, key)) })
+          ] }),
+          /* @__PURE__ */ jsxs("div", { className: styles$m.price, children: [
+            /* @__PURE__ */ jsx("span", { className: styles$m.amount, children: format(item2.line_total) }),
+            compareAt2 && /* @__PURE__ */ jsx("span", { className: styles$m.was, children: format(compareAt2) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx(
+          QtyStepper,
+          {
+            qty: item2.qty,
+            max: maxQty,
+            onChange: onQtyChange,
+            onRemove,
+            disabled: pending2,
+            capDescribedBy: notice
+          }
+        )
+      ] })
+    ] }),
+    lowStock2 && /* @__PURE__ */ jsx("div", { className: styles$m.labels, children: /* @__PURE__ */ jsx("span", { id: noticeId, className: styles$m.lowStock, role: "status", children: lowStockLabel(available) }) })
   ] });
 }
 const box$1 = "_box_1cf1a_1";
@@ -7552,7 +8437,7 @@ function StickyCtaBar({ children, info: info2, variant = "floating" }) {
 }
 const surface = "_surface_1wfue_15";
 const screen = "_screen_1wfue_20";
-const body$2 = "_body_1wfue_12";
+const body$3 = "_body_1wfue_12";
 const items = "_items_1wfue_34";
 const sectionHeader = "_sectionHeader_1wfue_40";
 const sectionTitle = "_sectionTitle_1wfue_46";
@@ -7561,7 +8446,7 @@ const lines = "_lines_1wfue_73";
 const styles$j = {
   surface,
   screen,
-  body: body$2,
+  body: body$3,
   items,
   sectionHeader,
   sectionTitle,
@@ -7646,12 +8531,16 @@ function CartViewContent({
     ).then((ok) => {
       if (!ok || !removed) return;
       emit({ type: "remove_from_cart", sku, qty: removed.qty });
-      toast2.show("Item removed", "neutral", {
-        label: "Undo",
-        onAction: () => {
-          void mutate(sku, () => api.cart.addItem({ sku, qty: removed.qty })).then((undone) => {
-            if (undone) emit({ type: "add_to_cart", sku, qty: removed.qty });
-          });
+      toast2.show("Removed from cart", {
+        description: describeLine(removed),
+        image: removed.image,
+        action: {
+          label: "Undo",
+          onAction: () => {
+            void mutate(sku, () => api.cart.addItem({ sku, qty: removed.qty })).then((undone) => {
+              if (undone) emit({ type: "add_to_cart", sku, qty: removed.qty });
+            });
+          }
         }
       });
     });
@@ -7706,7 +8595,6 @@ function CartViewContent({
       setHandingOff(false);
     }
   }
-  const locked = cart2.locked !== void 0;
   const itemCount = cart2.items.reduce((n, i) => n + i.qty, 0);
   return /* @__PURE__ */ jsxs("div", { className: styles$j.screen, children: [
     /* @__PURE__ */ jsxs("div", { className: styles$j.body, children: [
@@ -7719,8 +8607,9 @@ function CartViewContent({
           CartLineItem,
           {
             item: item2,
+            ...item2.compare_at_unit_price ? { compareAt: item2.compare_at_unit_price } : {},
             maxQty: item2.available,
-            pending: locked || pendingSku === item2.sku,
+            pending: pendingSku === item2.sku,
             onQtyChange: (qty) => changeQty(item2.sku, qty),
             onRemove: () => remove(item2.sku)
           }
@@ -7732,21 +8621,18 @@ function CartViewContent({
         {
           pricing: cart2.totals,
           deferred: ["shipping", "tax"],
+          ...cart2.totals.discount ? { discount: cart2.totals.discount } : {},
           hidden: cart2.hidden_lines
         }
       )
     ] }),
-    /* @__PURE__ */ jsx(StickyCtaBar, { variant: "divider", children: /* @__PURE__ */ jsx(
-      Button,
-      {
-        variant: "primary",
-        onClick: () => void handOff(cart2),
-        disabled: handingOff,
-        children: locked ? "Return to checkout" : checkoutLabel
-      }
-    ) })
+    /* @__PURE__ */ jsx(StickyCtaBar, { variant: "divider", children: /* @__PURE__ */ jsx(Button, { variant: "primary", onClick: () => void handOff(cart2), disabled: handingOff, children: checkoutLabel }) })
   ] });
 }
+function describeLine(item2) {
+  const size = item2.attributes?.size;
+  return [item2.title, size && `Size ${size}`].filter(Boolean).join(" · ") || void 0;
+}
 const CartSheetContext = createContext(null);
 function useCartSheet() {
   return useContext(CartSheetContext);
@@ -7761,15 +8647,15 @@ function CartSheetProvider({ children }) {
     isOpen && /* @__PURE__ */ jsx(BottomSheet, { open: true, onClose: close2, title: "Cart", children: /* @__PURE__ */ jsx(CartView, { onContinueShopping: close2 }) })
   ] });
 }
-const gallery = "_gallery_1e69n_1";
-const track$2 = "_track_1e69n_8";
-const slide$1 = "_slide_1e69n_25";
-const image$4 = "_image_1e69n_32";
-const placeholder$1 = "_placeholder_1e69n_36";
-const share = "_share_1e69n_43";
-const dots$2 = "_dots_1e69n_60";
-const dot$2 = "_dot_1e69n_60";
-const dotActive$2 = "_dotActive_1e69n_84";
+const gallery = "_gallery_10mch_1";
+const track$2 = "_track_10mch_8";
+const slide$1 = "_slide_10mch_32";
+const image$4 = "_image_10mch_39";
+const placeholder$1 = "_placeholder_10mch_43";
+const share = "_share_10mch_50";
+const dots$2 = "_dots_10mch_67";
+const dot$2 = "_dot_10mch_67";
+const dotActive$2 = "_dotActive_10mch_91";
 const styles$i = {
   gallery,
   track: track$2,
@@ -7852,79 +8738,141 @@ function MediaGallery({ media: media2, alt }) {
     )) })
   ] });
 }
-const scrim$3 = "_scrim_8wz6r_6";
-const sheet$1 = "_sheet_8wz6r_17";
-const grabber = "_grabber_8wz6r_29";
-const header$4 = "_header_8wz6r_37";
-const title$a = "_title_8wz6r_45";
-const close$1 = "_close_8wz6r_51";
-const tableWrap = "_tableWrap_8wz6r_71";
-const table = "_table_8wz6r_71";
-const notes = "_notes_8wz6r_95";
+const scrim$3 = "_scrim_ddqa4_8";
+const sheet$1 = "_sheet_ddqa4_2";
+const body$2 = "_body_ddqa4_40";
+const titles = "_titles_ddqa4_60";
+const title$a = "_title_ddqa4_60";
+const subtitle$3 = "_subtitle_ddqa4_76";
+const units = "_units_ddqa4_89";
+const unit = "_unit_ddqa4_89";
+const unitOn = "_unitOn_ddqa4_123";
+const unitOff = "_unitOff_ddqa4_131";
+const tableWrap = "_tableWrap_ddqa4_140";
+const table = "_table_ddqa4_140";
+const col = "_col_ddqa4_165";
+const colEdge = "_colEdge_ddqa4_169";
+const note = "_note_ddqa4_237";
+const how = "_how_ddqa4_249";
+const howTitle = "_howTitle_ddqa4_255";
+const howList = "_howList_ddqa4_263";
+const howItem = "_howItem_ddqa4_270";
+const howLabel = "_howLabel_ddqa4_295";
+const howText = "_howText_ddqa4_305";
+const fabric = "_fabric_ddqa4_314";
+const fabricLabel = "_fabricLabel_ddqa4_322";
+const fabricText = "_fabricText_ddqa4_330";
+const notes = "_notes_ddqa4_341";
 const styles$h = {
   scrim: scrim$3,
   sheet: sheet$1,
-  grabber,
-  header: header$4,
+  body: body$2,
+  titles,
   title: title$a,
-  close: close$1,
+  subtitle: subtitle$3,
+  units,
+  unit,
+  unitOn,
+  unitOff,
   tableWrap,
   table,
+  col,
+  colEdge,
+  note,
+  how,
+  howTitle,
+  howList,
+  howItem,
+  howLabel,
+  howText,
+  fabric,
+  fabricLabel,
+  fabricText,
   notes
 };
+const CM_PER_INCH = 2.54;
+const UNIT_LABEL = { cm: "cm", in: "inches" };
+function otherUnit(unit2) {
+  return unit2 === "cm" ? "in" : "cm";
+}
+function convert(cell, from, to) {
+  if (from === to) return cell;
+  const n = Number(cell);
+  if (cell.trim() === "" || !Number.isFinite(n)) return cell;
+  return (to === "in" ? n / CM_PER_INCH : n * CM_PER_INCH).toFixed(1);
+}
 function SizeGuideSheet({ guide, onClose }) {
-  const closeRef = useRef(null);
-  useEffect(() => {
-    closeRef.current?.focus();
-    function onKey(e) {
-      if (e.key === "Escape") onClose();
-    }
-    document.addEventListener("keydown", onKey);
-    return () => document.removeEventListener("keydown", onKey);
-  }, [onClose]);
+  const sheetRef = useRef(null);
   const columns = guide.columns ?? [];
-  const rows = guide.rows ?? [];
+  const rows = useMemo(() => guide.rows ?? [], [guide.rows]);
+  const measurements = guide.measurements ?? [];
   const notes2 = guide.notes ?? [];
   const hasTable = columns.length > 0 && rows.length > 0;
+  const authored = guide.unit;
+  const [unit2, setUnit] = useState(authored);
+  const shown = useMemo(
+    () => authored && unit2 && unit2 !== authored ? rows.map((row2) => row2.map((cell) => convert(cell, authored, unit2))) : rows,
+    [rows, authored, unit2]
+  );
+  useModalDialog(true, onClose, sheetRef);
   return /* @__PURE__ */ jsx("div", { className: styles$h.scrim, onClick: onClose, children: /* @__PURE__ */ jsxs(
-    "div",
+    ShopSurface,
     {
+      tone: "light",
+      ref: sheetRef,
       className: styles$h.sheet,
       role: "dialog",
       "aria-modal": "true",
       "aria-labelledby": "size-guide-title",
       onClick: (e) => e.stopPropagation(),
       children: [
-        /* @__PURE__ */ jsx("div", { className: styles$h.grabber, "aria-hidden": "true" }),
-        /* @__PURE__ */ jsxs("div", { className: styles$h.header, children: [
-          /* @__PURE__ */ jsx("h2", { id: "size-guide-title", className: styles$h.title, children: guide.title }),
-          /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(SheetHeader, { onClose, closeLabel: "Close size guide" }),
+        /* @__PURE__ */ jsxs("div", { className: styles$h.body, children: [
+          /* @__PURE__ */ jsxs("div", { className: styles$h.titles, children: [
+            /* @__PURE__ */ jsx("h2", { id: "size-guide-title", className: styles$h.title, children: guide.title }),
+            guide.subtitle && /* @__PURE__ */ jsx("p", { className: styles$h.subtitle, children: guide.subtitle })
+          ] }),
+          hasTable && authored && unit2 && /* @__PURE__ */ jsx("div", { className: styles$h.units, role: "radiogroup", "aria-label": "Measurement unit", children: [authored, otherUnit(authored)].map((u) => /* @__PURE__ */ jsx(
             "button",
             {
-              ref: closeRef,
               type: "button",
-              className: styles$h.close,
-              onClick: onClose,
-              "aria-label": "Close size guide",
-              children: /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx(
-                "path",
-                {
-                  d: "M4 4l8 8M12 4l-8 8",
-                  stroke: "currentColor",
-                  strokeWidth: "1.6",
-                  strokeLinecap: "round"
-                }
-              ) })
-            }
-          )
-        ] }),
-        hasTable && /* @__PURE__ */ jsx("div", { className: styles$h.tableWrap, children: /* @__PURE__ */ jsxs("table", { className: styles$h.table, children: [
-          /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsx("tr", { children: columns.map((c) => /* @__PURE__ */ jsx("th", { scope: "col", children: c }, c)) }) }),
-          /* @__PURE__ */ jsx("tbody", { children: rows.map((row2) => /* @__PURE__ */ jsx("tr", { children: row2.map(
-            (cell, i) => i === 0 ? /* @__PURE__ */ jsx("th", { scope: "row", children: cell }, cell) : /* @__PURE__ */ jsx("td", { children: cell }, `${cell}-${i}`)
-          ) }, row2.join("|"))) })
-        ] }) }),
-        notes2.length > 0 && /* @__PURE__ */ jsx("ul", { className: styles$h.notes, children: notes2.map((n) => /* @__PURE__ */ jsx("li", { children: n }, n)) })
+              role: "radio",
+              "aria-checked": u === unit2,
+              className: `${styles$h.unit} ${u === unit2 ? styles$h.unitOn : styles$h.unitOff}`,
+              onClick: () => setUnit(u),
+              children: UNIT_LABEL[u]
+            },
+            u
+          )) }),
+          hasTable && /* The chart can be wider than the sheet, so it scrolls inside its own
+          container rather than making the sheet scroll sideways. */
+          /* @__PURE__ */ jsx("div", { className: styles$h.tableWrap, children: /* @__PURE__ */ jsxs("table", { className: styles$h.table, children: [
+            /* @__PURE__ */ jsx("colgroup", { children: columns.map((c, i) => /* @__PURE__ */ jsx(
+              "col",
+              {
+                className: i === 0 || i === columns.length - 1 ? styles$h.colEdge : styles$h.col
+              },
+              c
+            )) }),
+            /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsx("tr", { children: columns.map((c) => /* @__PURE__ */ jsx("th", { scope: "col", children: c }, c)) }) }),
+            /* @__PURE__ */ jsx("tbody", { children: shown.map((row2, r) => /* @__PURE__ */ jsx("tr", { children: row2.map(
+              (cell, i) => i === 0 ? /* @__PURE__ */ jsx("th", { scope: "row", children: cell }, cell) : /* @__PURE__ */ jsx("td", { children: cell }, `${cell}-${i}`)
+            ) }, rows[r]?.join("|") ?? r)) })
+          ] }) }),
+          guide.note && /* @__PURE__ */ jsx("p", { className: styles$h.note, children: guide.note }),
+          measurements.length > 0 && /* @__PURE__ */ jsxs("section", { className: styles$h.how, "aria-labelledby": "size-guide-how", children: [
+            /* @__PURE__ */ jsx("h3", { id: "size-guide-how", className: styles$h.howTitle, children: "How to measure" }),
+            /* @__PURE__ */ jsx("dl", { className: styles$h.howList, children: measurements.map((m) => /* @__PURE__ */ jsxs("div", { className: styles$h.howItem, children: [
+              /* @__PURE__ */ jsx("dt", { className: styles$h.howLabel, children: m.label }),
+              /* @__PURE__ */ jsx("dd", { className: styles$h.howText, children: m.description })
+            ] }, m.label)) })
+          ] }),
+          guide.fabric && /* @__PURE__ */ jsxs("div", { className: styles$h.fabric, children: [
+            /* @__PURE__ */ jsx("p", { className: styles$h.fabricLabel, children: "Fabric" }),
+            /* @__PURE__ */ jsx("p", { className: styles$h.fabricText, children: guide.fabric })
+          ] }),
+          notes2.length > 0 && /* @__PURE__ */ jsx("ul", { className: styles$h.notes, children: notes2.map((n) => /* @__PURE__ */ jsx("li", { children: n }, n)) })
+        ] })
       ]
     }
   ) });
@@ -8020,18 +8968,18 @@ function SizeSelector({
     guide && guideOpen && /* @__PURE__ */ jsx(SizeGuideSheet, { guide, onClose: () => setGuideOpen(false) })
   ] });
 }
-const root$1 = "_root_1j4n8_1";
-const header$2 = "_header_1j4n8_7";
-const title$8 = "_title_1j4n8_14";
-const value = "_value_1j4n8_19";
-const tiles = "_tiles_1j4n8_24";
-const tile = "_tile_1j4n8_24";
-const selected$1 = "_selected_1j4n8_48";
-const media = "_media_1j4n8_32";
-const image$3 = "_image_1j4n8_60";
-const placeholder = "_placeholder_1j4n8_64";
-const scrim$2 = "_scrim_1j4n8_72";
-const stockBadge = "_stockBadge_1j4n8_91";
+const root$1 = "_root_1h4ny_1";
+const header$2 = "_header_1h4ny_9";
+const title$8 = "_title_1h4ny_18";
+const value = "_value_1h4ny_23";
+const tiles = "_tiles_1h4ny_28";
+const tile = "_tile_1h4ny_28";
+const selected$1 = "_selected_1h4ny_52";
+const media = "_media_1h4ny_36";
+const image$3 = "_image_1h4ny_64";
+const placeholder = "_placeholder_1h4ny_68";
+const scrim$2 = "_scrim_1h4ny_76";
+const stockBadge = "_stockBadge_1h4ny_95";
 const styles$f = {
   root: root$1,
   header: header$2,
@@ -8056,7 +9004,7 @@ function ColorSelector({ colours, selected: selected2, onSelect }) {
     /* @__PURE__ */ jsx("div", { className: styles$f.tiles, role: "radiogroup", "aria-label": "Color", "aria-required": "true", children: colours.map((c) => {
       const isSelected = c.value === selected2;
       const soldOut = !c.available;
-      const lowStock = !soldOut && c.remaining !== void 0 && c.remaining > 0 && c.remaining <= 5;
+      const lowStock2 = !soldOut && isLowStock(c.remaining);
       return /* @__PURE__ */ jsxs(
         "button",
         {
@@ -8071,7 +9019,7 @@ function ColorSelector({ colours, selected: selected2, onSelect }) {
               c.image ? /* @__PURE__ */ jsx(ShopImage, { src: c.image, alt: "", fill: true, sizes: "79px", className: styles$f.image }) : /* @__PURE__ */ jsx("span", { className: styles$f.placeholder, "aria-hidden": "true" }),
               soldOut && /* @__PURE__ */ jsx("span", { className: styles$f.scrim, "aria-hidden": "true", children: "Out of stock" })
             ] }),
-            lowStock && /* @__PURE__ */ jsx("span", { className: styles$f.stockBadge, "aria-hidden": "true", children: `${c.remaining} left` })
+            lowStock2 && /* @__PURE__ */ jsx("span", { className: styles$f.stockBadge, "aria-hidden": "true", children: `${c.remaining} left` })
           ]
         },
         c.value
@@ -8156,14 +9104,34 @@ function paragraphsOf(description2) {
 }
 function ProductDetails({ description: description2 }) {
   const [expanded, setExpanded] = useState(false);
+  const [clipped, setClipped] = useState(null);
+  const bodyRef = useRef(null);
   const paragraphs = paragraphsOf(description2);
+  useEffect(() => {
+    if (expanded) return;
+    const el = bodyRef.current;
+    if (!el) return;
+    const measure = () => setClipped(el.scrollHeight - el.clientHeight > 1);
+    measure();
+    const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(measure);
+    observer?.observe(el);
+    const fonts = document.fonts;
+    let live = true;
+    void fonts?.ready.then(() => {
+      if (live) measure();
+    });
+    return () => {
+      live = false;
+      observer?.disconnect();
+    };
+  }, [expanded, description2]);
   if (paragraphs.length === 0) return null;
   return /* @__PURE__ */ jsxs("section", { className: styles$d.root, "aria-labelledby": "details-heading", children: [
     /* @__PURE__ */ jsxs("div", { className: styles$d.group, children: [
       /* @__PURE__ */ jsx("h2", { id: "details-heading", className: styles$d.title, children: "Product details" }),
-      /* @__PURE__ */ jsx("div", { className: [styles$d.body, expanded ? "" : styles$d.clamped].join(" "), children: paragraphs.map((p) => /* @__PURE__ */ jsx("p", { className: styles$d.paragraph, children: p }, p)) })
+      /* @__PURE__ */ jsx("div", { ref: bodyRef, className: [styles$d.body, expanded ? "" : styles$d.clamped].join(" "), children: paragraphs.map((p) => /* @__PURE__ */ jsx("p", { className: styles$d.paragraph, children: p }, p)) })
     ] }),
-    /* @__PURE__ */ jsx(
+    clipped ? /* @__PURE__ */ jsx(
       "button",
       {
         type: "button",
@@ -8172,7 +9140,7 @@ function ProductDetails({ description: description2 }) {
         onClick: () => setExpanded((v) => !v),
         children: expanded ? "Less" : "more"
       }
-    )
+    ) : null
   ] });
 }
 const row$3 = "_row_l4edh_1";
@@ -8392,9 +9360,9 @@ function ProductDetail({ product, inventory: inventory2, recommendations = [] })
   const inCart = selectedSku !== null && added.includes(selectedSku);
   const selectedVariant = hasVariants ? variants.find((v) => v.sku === selectedSku) : void 0;
   const available = selectedVariant?.available ?? inventory2?.available ?? 0;
-  const lowStock = available > 0 && available <= 5;
-  const stockNotice = !purchasable || lowStock;
-  const availabilityLabel = !purchasable ? "Out of stock" : lowStock ? `Only ${available} left` : "";
+  const lowStock2 = isLowStock(available);
+  const stockNotice = !purchasable || lowStock2;
+  const availabilityLabel = !purchasable ? "Out of stock" : lowStock2 ? lowStockLabel(available) : "";
   const cta2 = purchasable ? (
     /*
      * Three labels, one button (5241:71382 / 5295:75115 / 5268:72907). "Adding to cart"
@@ -8587,15 +9555,15 @@ function LifestyleImage({ images }) {
     )) })
   ] }) });
 }
-const section$2 = "_section_n8xka_1";
-const track = "_track_n8xka_8";
-const card = "_card_n8xka_38";
-const quote = "_quote_n8xka_50";
-const author = "_author_n8xka_58";
-const dots = "_dots_n8xka_64";
-const dot = "_dot_n8xka_64";
-const dotActive = "_dotActive_n8xka_77";
-const disclaimer = "_disclaimer_n8xka_83";
+const section$2 = "_section_kdf3c_1";
+const track = "_track_kdf3c_8";
+const card = "_card_kdf3c_38";
+const quote = "_quote_kdf3c_50";
+const author = "_author_kdf3c_58";
+const dots = "_dots_kdf3c_69";
+const dot = "_dot_kdf3c_69";
+const dotActive = "_dotActive_kdf3c_85";
+const disclaimer = "_disclaimer_kdf3c_91";
 const styles$6 = {
   section: section$2,
   track,
@@ -8630,10 +9598,10 @@ function ReviewCarousel({ quotes, disclaimer: disclaimer2 }) {
     disclaimer2 && /* @__PURE__ */ jsx("p", { className: styles$6.disclaimer, children: disclaimer2 })
   ] });
 }
-const section$1 = "_section_145t0_1";
-const row$2 = "_row_145t0_9";
-const title$4 = "_title_145t0_21";
-const body = "_body_145t0_29";
+const section$1 = "_section_1tevp_1";
+const row$2 = "_row_1tevp_9";
+const title$4 = "_title_1tevp_21";
+const body = "_body_1tevp_38";
 const styles$5 = {
   section: section$1,
   row: row$2,
@@ -8646,10 +9614,10 @@ function WhyUs({ items: items2 }) {
     /* @__PURE__ */ jsx("p", { className: styles$5.body, children: it.body })
   ] }, i)) });
 }
-const section = "_section_opjfc_1";
-const title$3 = "_title_opjfc_8";
-const list$1 = "_list_opjfc_15";
-const row$1 = "_row_opjfc_26";
+const section = "_section_snuuj_1";
+const title$3 = "_title_snuuj_10";
+const list$1 = "_list_snuuj_17";
+const row$1 = "_row_snuuj_32";
 const styles$4 = {
   section,
   title: title$3,
@@ -8690,11 +9658,13 @@ function Block({ block }) {
         block.title && /* @__PURE__ */ jsx("h2", { className: styles$3.blockTitle, children: block.title }),
         /* @__PURE__ */ jsx(ProductTile, { product: block.product, priority: true, size: "large" })
       ] });
+    case "product_gallery":
+      return /* @__PURE__ */ jsx(ProductGallery, { title: block.title, product: block.product });
     case "lifestyle_image":
       return /* @__PURE__ */ jsx(LifestyleImage, { images: block.images });
     case "grid":
       return /* @__PURE__ */ jsxs("div", { className: styles$3.gridBlock, children: [
-        /* @__PURE__ */ jsx("h2", { className: styles$3.blockTitle, children: block.title }),
+        block.title && /* @__PURE__ */ jsx("h2", { className: styles$3.blockTitle, children: block.title }),
         /* @__PURE__ */ jsx("ul", { className: styles$3.grid, children: block.products.map((p) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(ProductTile, { product: p }) }, p.sku)) })
       ] });
     case "review":
@@ -9378,15 +10348,23 @@ export {
   PriceBlock,
   ProductDetail,
   ProductDetails,
+  ProductGallery,
   ProductGrid,
   ProductTile,
   ProductView,
   PromoBanner,
   QtyStepper,
+  RETURN_REASONS,
   RailCarousel,
+  ReasonSheet,
+  ReturnFlowView,
+  ReturnItemsView,
+  ReturnLabelView,
+  ReturnTrackingView,
   ReviewCarousel,
   SaleBadge,
   ScreenSkeleton,
+  SheetHeader,
   ShippingInfo,
   ShopHeader,
   HomeShowcase as ShopHome,