@shipengine/elements 0.14.0 → 0.15.0

package/index.js

@@ -1991,7 +1991,7 @@ const useConfirmationOptions = () => {
   } = useTranslation("common");
   return useMemo(() => Object.values(SE.ConfirmationType)
   // TODO: Remove this filter once these options are better supported by UpdateShipment
-  .filter(v => v !== SE.ConfirmationType.VERBAL_CONFIRMATION && v !== SE.ConfirmationType.DELIVERY_MAILED).flatMap(v => v === "none" ? [] : {
+  .filter(v => v !== SE.ConfirmationType.DELIVERY_MAILED && v !== SE.ConfirmationType.DIRECT_SIGNATURE && v !== SE.ConfirmationType.VERBAL_CONFIRMATION).flatMap(v => v === "none" ? [] : {
     label: t(`confirmationTypes.${camelize(v)}`),
     value: v
   }), [t]);
@@ -20702,24 +20702,23 @@ const ElementsContext = /*#__PURE__*/createContext(undefined);
  */
 const ElementsProvider = ({
   baseURL,
+  brandName,
   children,
   environment: _environment = "production",
-  onError,
-  brandName,
-  token
+  getToken,
+  onError
 }) => {
   const value = useMemo(() => ({
     brandName,
     environment: _environment,
-    onError,
-    token
-  }), [_environment, token, onError, brandName]);
+    onError
+  }), [_environment, onError, brandName]);
   return jsx(ShipEngineProvider, Object.assign({
     baseURL: baseURL ? `${baseURL}/api` : "/api",
+    getToken: getToken,
     headers: {
       "X-Environment": `${_environment}`
-    },
-    token: token
+    }
   }, {
     children: jsx(ElementsContext.Provider, Object.assign({
       value: value
@@ -22413,40 +22412,127 @@ const AddressParser = ({
   }));
 };
 
-var PROPER_FUNCTION_NAME = functionName.PROPER;
-var fails$4 = fails$r;
-var whitespaces = whitespaces$4;
-
-var non = '\u200B\u0085\u180E';
-
-// check that a method works with the correct list
-// of whitespaces and has a correct name
-var stringTrimForced = function (METHOD_NAME) {
-  return fails$4(function () {
-    return !!whitespaces[METHOD_NAME]()
-      || non[METHOD_NAME]() !== non
-      || (PROPER_FUNCTION_NAME && whitespaces[METHOD_NAME].name !== METHOD_NAME);
+const AddressFields = ({
+  domestic,
+  form,
+  formatFieldName: _formatFieldName = fieldName => fieldName,
+  formId
+}) => {
+  const {
+    t
+  } = useTranslation();
+  const countryCodeOptions = useCountryCodeOptions(domestic);
+  const stateCodeOptions = useStateCodeOptions(domestic);
+  const {
+    isSubmitted
+  } = form.formState;
+  const watchCountryCode = form.watch(_formatFieldName("countryCode"));
+  return jsxs(Fragment, {
+    children: [jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.name"),
+      labelWeight: "normal",
+      name: _formatFieldName("name")
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.company"),
+      labelWeight: "normal",
+      name: _formatFieldName("companyName"),
+      subLabel: t("address.subFields.optional")
+    }), jsx(Select, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.countryCode"),
+      labelWeight: "normal",
+      name: _formatFieldName("countryCode"),
+      onChange: e => {
+        if (typeof e === "string") {
+          form.setValue(_formatFieldName("stateProvince"), null, {
+            shouldValidate: isSubmitted
+          });
+        }
+      },
+      options: countryCodeOptions
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.addressLine1"),
+      labelWeight: "normal",
+      name: _formatFieldName("addressLine1")
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.addressLine2"),
+      labelWeight: "normal",
+      name: _formatFieldName("addressLine2")
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.cityLocality"),
+      labelWeight: "normal",
+      name: _formatFieldName("cityLocality")
+    }), watchCountryCode === "US" ?
+    // Domestic States
+    jsx(Select, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.stateProvince"),
+      labelWeight: "normal",
+      name: _formatFieldName("stateProvince"),
+      options: stateCodeOptions
+    }) :
+    // International Provinces
+    jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.stateProvince"),
+      labelWeight: "normal",
+      name: _formatFieldName("stateProvince")
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.postalCode"),
+      labelWeight: "normal",
+      name: _formatFieldName("postalCode")
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.phone"),
+      labelWeight: "normal",
+      name: _formatFieldName("phone"),
+      subLabel: t("address.subFields.optional")
+    }), jsx(TextInput, {
+      control: form.control,
+      form: formId,
+      label: t("address.fields.email"),
+      labelWeight: "normal",
+      name: _formatFieldName("email"),
+      subLabel: t("address.subFields.optional")
+    })]
   });
 };
 
-var $$a = _export;
-var $trim = stringTrim.trim;
-var forcedStringTrimMethod = stringTrimForced;
-
-// `String.prototype.trim` method
-// https://tc39.es/ecma262/#sec-string.prototype.trim
-$$a({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
-  trim: function trim() {
-    return $trim(this);
-  }
-});
+/* eslint-disable @typescript-eslint/no-unused-vars -- Allow unused generics in ZodObject interface overload */
+function nullishDefault(defaultValue) {
+  return this.nullish().transform(v => v !== null && v !== void 0 ? v : defaultValue);
+}
+/**
+ * @category Form Validation
+ */
+const extendZod = () => {
+  z.ZodString.prototype.nullishDefault = nullishDefault;
+  z.ZodNumber.prototype.nullishDefault = nullishDefault;
+  z.ZodObject.prototype.nullishDefault = nullishDefault;
+};
 
 // TODO: Remove from `core-js@4` since it's moved to entry points
 
 var uncurryThis$6 = functionUncurryThisClause;
 var defineBuiltIn$3 = defineBuiltIn$8;
 var regexpExec$1 = regexpExec$2;
-var fails$3 = fails$r;
+var fails$4 = fails$r;
 var wellKnownSymbol$7 = wellKnownSymbol$j;
 var createNonEnumerableProperty = createNonEnumerableProperty$5;
 
@@ -22456,14 +22542,14 @@ var RegExpPrototype = RegExp.prototype;
 var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
   var SYMBOL = wellKnownSymbol$7(KEY);
 
-  var DELEGATES_TO_SYMBOL = !fails$3(function () {
+  var DELEGATES_TO_SYMBOL = !fails$4(function () {
     // String methods call symbol-named RegEp methods
     var O = {};
     O[SYMBOL] = function () { return 7; };
     return ''[KEY](O) != 7;
   });
 
-  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$3(function () {
+  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$4(function () {
     // Symbol-named RegExp methods call .exec
     var execCalled = false;
     var re = /a/;
@@ -22629,104 +22715,72 @@ fixRegExpWellKnownSymbolLogic$1('match', function (MATCH, nativeMatch, maybeCall
   ];
 });
 
-/* eslint-disable @typescript-eslint/no-unused-vars -- Allow unused generics in ZodObject interface overload */
-function nullishDefault(defaultValue) {
-  return this.nullish().transform(v => v !== null && v !== void 0 ? v : defaultValue);
-}
-/**
- * @category Form Validation
- */
-const extendZod = () => {
-  z.ZodString.prototype.nullishDefault = nullishDefault;
-  z.ZodNumber.prototype.nullishDefault = nullishDefault;
-  z.ZodObject.prototype.nullishDefault = nullishDefault;
+var PROPER_FUNCTION_NAME = functionName.PROPER;
+var fails$3 = fails$r;
+var whitespaces = whitespaces$4;
+
+var non = '\u200B\u0085\u180E';
+
+// check that a method works with the correct list
+// of whitespaces and has a correct name
+var stringTrimForced = function (METHOD_NAME) {
+  return fails$3(function () {
+    return !!whitespaces[METHOD_NAME]()
+      || non[METHOD_NAME]() !== non
+      || (PROPER_FUNCTION_NAME && whitespaces[METHOD_NAME].name !== METHOD_NAME);
+  });
 };
 
-extendZod();
-/**
- * @category Form Validation
- */
-const addressLine1Schema = z.string().trim().min(1);
-/**
- * @category Form Validation
- */
-const addressLine1SchemaNoPoBox = addressLine1Schema.refine(val => !isPoBox(val), {
-  message: "schemaErrors.invalidAddressPoBox"
-});
-/**
- * @category Form Validation
- */
-const addressLine2Schema = z.string().trim().nullishDefault(undefined);
-/**
- * @category Form Validation
- */
-const addressLine2SchemaNoPoBox = addressLine2Schema.refine(val => !val || !isPoBox(val), {
-  message: "schemaErrors.invalidAddressPoBox"
-});
+var $$a = _export;
+var $trim = stringTrim.trim;
+var forcedStringTrimMethod = stringTrimForced;
 
-/**
- * @category Form Validation
- */
-const moneySchema = z.object({
-  amount: z.number().nonnegative(),
-  currency: z.nativeEnum(SE.Currency)
+// `String.prototype.trim` method
+// https://tc39.es/ecma262/#sec-string.prototype.trim
+$$a({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
+  trim: function trim() {
+    return $trim(this);
+  }
 });
 
-/**
- * @category Form Validation
- */
-const phoneSchema = (defaultCountryCode = "US") => z.string().trim().refine(val => isValidPhoneNumber(val, defaultCountryCode), "schemaErrors.notAValidPhoneNumber");
-/**
- * @category Form Validation
- */
-const phoneSchemaUnvalidated = z.string().trim();
-
 extendZod();
-const postalCodeRegex = /(^\d{5}$)|(^\d{5}-\d{4}$)/;
-const baseSchema = z.object({
-  addressLine1: addressLine1Schema,
-  addressLine2: addressLine2Schema,
+const refineName = n => n.match(/^[a-zA-Z]{2,} [a-zA-Z]{2,}/);
+const addressSchema = z.object({
+  addressLine1: z.string().trim().min(1),
+  addressLine2: z.string().trim().nullishDefault(undefined),
   cityLocality: z.string().trim().min(1),
   companyName: z.string().trim().min(2).max(40).nullishDefault(undefined),
   countryCode: z.enum(countryCodes),
   email: z.string().trim().email().nullishDefault(""),
-  name: z.string().trim().min(1),
-  phone: phoneSchemaUnvalidated.nullishDefault("")
-});
-const domesticSchema = baseSchema.extend({
-  __mode: z.literal("domestic"),
-  postalCode: z.string().trim().regex(postalCodeRegex),
-  stateProvince: z.enum(usStateCodes)
-});
-const foreignSchema = baseSchema.extend({
-  __mode: z.literal("foreign"),
+  name: z.string().trim().min(1).refine(refineName, "schemaErrors.invalidAddressName"),
+  phone: z.string().trim().nullishDefault(""),
   postalCode: z.string().trim(),
   stateProvince: z.string().trim().nullishDefault("")
 });
-const addressSchema = z.discriminatedUnion("__mode", [domesticSchema, foreignSchema]).refine(schema => {
-  var _a;
-  return (_a = schema.name) === null || _a === void 0 ? void 0 : _a.match(/^[a-zA-Z]{2,} [a-zA-Z]{2,}/);
+
+extendZod();
+const postalCodeRegex$1 = /(^\d{5}$)|(^\d{5}-\d{4}$)/;
+const addressFormSchema = addressSchema.refine(schema => !schema.phone || isValidPhoneNumber(schema.phone, schema.countryCode), {
+  message: "schemaErrors.notAValidPhoneNumber",
+  path: ["phone"]
+}).refine(schema => {
+  if (schema.countryCode === "US") {
+    return schema.stateProvince && usStateCodes.includes(schema.stateProvince);
+  }
+  return true;
 }, {
-  message: "schemaErrors.invalidAddressName",
-  path: ["name"]
+  message: "schemaErrors.invalidStateProvince",
+  path: ["stateProvince"]
 }).refine(schema => {
-  var _a, _b, _c;
-  return ((_b = (_a = schema.companyName) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) < 2 ?
-  // If companyName is less than 2 characters, name must be 2 words of 2 characters each
-  (_c = schema.name) === null || _c === void 0 ? void 0 : _c.match(/^[a-zA-Z]{2,} [a-zA-Z]{2,}/) : true;
+  if (schema.countryCode === "US") {
+    return postalCodeRegex$1.test(schema.postalCode);
+  }
+  return true;
 }, {
-  message: "schemaErrors.invalidAddressName",
-  path: ["name"]
-}).refine(schema => !schema.phone || isValidPhoneNumber(schema.phone,
-//TODO: Some of our countries appear to be unsupported by libphonenumber. What should we do here?
-schema.countryCode), {
-  message: "schemaErrors.notAValidPhoneNumber",
-  path: ["phone"]
+  message: "schemaErrors.invalidPostalCode",
+  path: ["postalCode"]
 });
 
-const selectMode = ({
-  countryCode
-} = {}) => countryCode === "US" ? "domestic" : "foreign";
 const AddressForm = ({
   address,
   domestic,
@@ -22740,29 +22794,19 @@ const AddressForm = ({
   const {
     t
   } = useTranslation();
-  const countryCodeOptions = useCountryCodeOptions(domestic);
-  const stateCodeOptions = useStateCodeOptions(domestic);
   const form = useForm({
-    defaultValues: Object.assign({
-      __mode: selectMode(address)
-    }, address && address),
-    resolver: validationResolver(addressSchema)
+    defaultValues: Object.assign({}, address && address),
+    resolver: validationResolver(addressFormSchema)
   });
-  form.register("__mode");
-  const {
-    isSubmitted
-  } = form.formState;
-  const watchCountryCode = form.watch("countryCode");
   const handleSubmit = form.handleSubmit(values => __awaiter(void 0, void 0, void 0, function* () {
-    const _a = values,
-      payload = __rest(_a, ["__mode"]);
+    const payload = __rest(values, []);
     onSubmit(payload);
   }));
   const handleSubmitParse = useCallback(payload => __awaiter(void 0, void 0, void 0, function* () {
-    var _b;
+    var _a;
     const parseResult = yield onSubmitParse === null || onSubmitParse === void 0 ? void 0 : onSubmitParse(payload);
-    const _c = (_b = parseResult === null || parseResult === void 0 ? void 0 : parseResult.address) !== null && _b !== void 0 ? _b : {},
-      updatedFields = __rest(_c, ["addressResidentialIndicator"]);
+    const _b = (_a = parseResult === null || parseResult === void 0 ? void 0 : parseResult.address) !== null && _a !== void 0 ? _a : {},
+      updatedFields = __rest(_b, ["addressResidentialIndicator"]);
     form.reset(Object.assign(Object.assign({}, form.getValues()), updatedFields), {
       keepDefaultValues: true
     });
@@ -22805,91 +22849,10 @@ const AddressForm = ({
           children: t("address.paste")
         }))
       }))]
-    })), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.name"),
-      labelWeight: "normal",
-      name: "name"
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.company"),
-      labelWeight: "normal",
-      name: "companyName",
-      subLabel: t("address.subFields.optional")
-    }), jsx(Select, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.countryCode"),
-      labelWeight: "normal",
-      name: "countryCode",
-      onChange: e => {
-        if (typeof e === "string") {
-          form.setValue("__mode", selectMode({
-            countryCode: e
-          }));
-          form.setValue("stateProvince", null, {
-            shouldValidate: isSubmitted
-          });
-        }
-      },
-      options: countryCodeOptions
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.addressLine1"),
-      labelWeight: "normal",
-      name: "addressLine1"
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.addressLine2"),
-      labelWeight: "normal",
-      name: "addressLine2"
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.cityLocality"),
-      labelWeight: "normal",
-      name: "cityLocality"
-    }), watchCountryCode === "US" ?
-    // Domestic States
-    jsx(Select, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.stateProvince"),
-      labelWeight: "normal",
-      name: "stateProvince",
-      options: stateCodeOptions
-    }) :
-    // International Provinces
-    jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.stateProvince"),
-      labelWeight: "normal",
-      name: "stateProvince"
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.postalCode"),
-      labelWeight: "normal",
-      name: "postalCode"
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.phone"),
-      labelWeight: "normal",
-      name: "phone",
-      subLabel: t("address.subFields.optional")
-    }), jsx(TextInput, {
-      control: form.control,
-      form: formId,
-      label: t("address.fields.email"),
-      labelWeight: "normal",
-      name: "email",
-      subLabel: t("address.subFields.optional")
+    })), jsx(AddressFields, {
+      domestic: domestic,
+      form: form,
+      formId: formId
     }), jsxs(ButtonGroup, Object.assign({
       justify: "end"
     }, {
@@ -23218,6 +23181,45 @@ if (DESCRIPTORS$1 && isCallable$6(NativeSymbol) && (!('description' in SymbolPro
   });
 }
 
+extendZod();
+/**
+ * @category Form Validation
+ */
+const addressLine1Schema = z.string().trim().min(1);
+/**
+ * @category Form Validation
+ */
+const addressLine1SchemaNoPoBox = addressLine1Schema.refine(val => !isPoBox(val), {
+  message: "schemaErrors.invalidAddressPoBox"
+});
+/**
+ * @category Form Validation
+ */
+const addressLine2Schema = z.string().trim().nullishDefault(undefined);
+/**
+ * @category Form Validation
+ */
+const addressLine2SchemaNoPoBox = addressLine2Schema.refine(val => !val || !isPoBox(val), {
+  message: "schemaErrors.invalidAddressPoBox"
+});
+
+/**
+ * @category Form Validation
+ */
+const moneySchema = z.object({
+  amount: z.number().nonnegative(),
+  currency: z.nativeEnum(SE.Currency)
+});
+
+/**
+ * @category Form Validation
+ */
+const phoneSchema = (defaultCountryCode = "US") => z.string().trim().refine(val => isValidPhoneNumber(val, defaultCountryCode), "schemaErrors.notAValidPhoneNumber");
+/**
+ * @category Form Validation
+ */
+const phoneSchemaUnvalidated = z.string().trim();
+
 extendZod();
 const customsItemFormSchema = z.object({
   countryOfOrigin: z.enum(countryCodes),
@@ -25430,23 +25432,52 @@ $$3({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, {
 });
 
 const expirationYears = getExpirationYears(10);
-//TODO: LMNT-781 Integrate reusable address schema
-const billingSchema = baseSchema.extend({
-  cvv: z.string().trim().refine(cvv => cardValidator.cvv(cvv).isValid, "Invalid CVV"),
-  expirationMonth: z.enum(["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]),
-  expirationYear: z.string().trim().length(4).refine(year => expirationYears.includes(year), "Invalid year"),
-  number: z.string().trim().refine(number => cardValidator.number(number).isValid, "Invalid card number").refine(number => {
-    var _a, _b;
-    return !((_a = cardValidator.number(number).card) === null || _a === void 0 ? void 0 : _a.type) || ["visa", "mastercard", "american-express", "discover"].includes((_b = cardValidator.number(number).card) === null || _b === void 0 ? void 0 : _b.type);
-  }, "Card type must be Visa, Mastercard, American Express, or Discover"),
+const postalCodeRegex = /(^\d{5}$)|(^\d{5}-\d{4}$)/;
+const creditCardTypes = ["visa", "mastercard", "american-express", "discover"];
+const expirationMonths = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
+const billingSchema = z.object({
+  address: addressSchema.refine(schema => !schema.phone || isValidPhoneNumber(schema.phone, schema.countryCode), {
+    message: "schemaErrors.notAValidPhoneNumber",
+    path: ["phone"]
+  }).refine(schema => {
+    if (schema.countryCode === "US") {
+      return schema.stateProvince && usStateCodes.includes(schema.stateProvince);
+    }
+    return true;
+  }, {
+    message: "schemaErrors.invalidStateProvince",
+    path: ["stateProvince"]
+  }).refine(schema => {
+    if (schema.countryCode === "US") {
+      return postalCodeRegex.test(schema.postalCode);
+    }
+    return true;
+  }, {
+    message: "schemaErrors.invalidPostalCode",
+    path: ["postalCode"]
+  }),
+  creditCard: z.object({
+    cvv: z.string().trim().refine(cvv => cardValidator.cvv(cvv).isValid, "Invalid CVV"),
+    expirationMonth: z.enum(expirationMonths),
+    expirationYear: z.string().trim().length(4).refine(year => expirationYears.includes(year), "Invalid year"),
+    number: z.string().trim().refine(number => cardValidator.number(number).isValid, "Invalid card number").refine(number => {
+      var _a, _b;
+      return !((_a = cardValidator.number(number).card) === null || _a === void 0 ? void 0 : _a.type) || creditCardTypes.includes((_b = cardValidator.number(number).card) === null || _b === void 0 ? void 0 : _b.type);
+    }, "Card type must be Visa, Mastercard, American Express, or Discover"),
+    type: z.string().optional()
+  }),
   setAsDefaultAddress: z.boolean().optional()
 }).transform(schema => {
   var _a;
-  const {
-    number
-  } = schema;
+  const _b = schema.creditCard,
+    creditCard = __rest(_b, ["cvv"]);
   return Object.assign(Object.assign({}, schema), {
-    type: (_a = cardValidator.number(number).card) === null || _a === void 0 ? void 0 : _a.type
+    agreeToCarrierTerms: true,
+    creditCard: Object.assign(Object.assign({}, creditCard), {
+      name: schema.address.name,
+      type: (_a = cardValidator.number(creditCard.number).card) === null || _a === void 0 ? void 0 : _a.type
+    }),
+    email: schema.address.email
   });
 });
 
@@ -25464,8 +25495,8 @@ const BillingForm = ({
     resolver: validationResolver(billingSchema)
   });
   const handleSubmit = form.handleSubmit(values => __awaiter(void 0, void 0, void 0, function* () {
-    const billingPayload = __rest(values, []);
-    onSubmit(billingPayload);
+    const payload = __rest(values, []);
+    onSubmit(payload);
   }));
   const expirationMonthOptions = useExpirationMonthOptions();
   return jsxs("form", Object.assign({
@@ -25475,23 +25506,26 @@ const BillingForm = ({
       control: form.control,
       label: t("billing.fields.cardNumber"),
       labelWeight: "normal",
-      name: "number"
+      name: "creditCard.number"
     }), jsx(Select, {
       control: form.control,
       label: t("billing.fields.expirationMonth"),
       labelWeight: "normal",
-      name: "expirationMonth",
+      name: "creditCard.expirationMonth",
       options: expirationMonthOptions
     }), jsx(TextInput, {
       control: form.control,
       label: t("billing.fields.expirationYear"),
       labelWeight: "normal",
-      name: "expirationYear"
+      name: "creditCard.expirationYear"
     }), jsx(TextInput, {
       control: form.control,
       label: t("billing.fields.cvv"),
       labelWeight: "normal",
-      name: "cvv"
+      name: "creditCard.cvv"
+    }), jsx(AddressFields, {
+      form: form,
+      formatFieldName: fieldName => `address.${fieldName}`
     }), jsx(CheckboxInput, {
       checkboxLabel: "Set as my default Ship From address",
       control: form.control,
@@ -27146,7 +27180,8 @@ var index$1 = /*#__PURE__*/Object.freeze({
   AddCarriers: AddCarriers$1,
   AddressDisplay: AddressDisplay,
   AddressForm: AddressForm,
-  baseSchema: baseSchema,
+  addressFormSchema: addressFormSchema,
+  AddressFields: AddressFields,
   addressSchema: addressSchema,
   AddressParser: AddressParser,
   addressParserSchema: addressParserSchema,
@@ -28285,6 +28320,8 @@ var common = {
 		},
 		invalidAddressName: "Recipient Name must have two characters in First and Last Name.",
 		invalidAddressPoBox: "A physical address is required for wallet registration. You can add a PO Box as a Ship From address.",
+		invalidPostalCode: "Invalid Postal Code",
+		invalidStateProvince: "Invalid State",
 		invalidString: "{{fieldLabel}} is invalid",
 		nonnegative: "{{fieldLabel}} must be 0 or more",
 		nonnegativeList: "{{ fieldLabels, list }} must each be 0 or more",
@@ -29111,7 +29148,7 @@ const useRatesForm = ({
     errors: labelErrors,
     reset: resetLabel,
     trigger: createLabel
-  } = useCreateLabel(printLabelLayout);
+  } = useCreateLabel();
   const {
     ratesCalculating,
     ratesErrors,
@@ -29139,6 +29176,7 @@ const useRatesForm = ({
       }
       try {
         const label = yield createLabel({
+          labelLayout: printLabelLayout,
           rateId
         });
         if (label) {
@@ -29150,7 +29188,7 @@ const useRatesForm = ({
         yield onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure(rate, shipment);
       }
     }
-  }), [createLabel, onBeforeLabelCreate, onLabelCreateFailure, onLabelCreateSuccess, ratesResponse === null || ratesResponse === void 0 ? void 0 : ratesResponse.rates, shipment]);
+  }), [createLabel, onBeforeLabelCreate, onLabelCreateFailure, onLabelCreateSuccess, printLabelLayout, ratesResponse === null || ratesResponse === void 0 ? void 0 : ratesResponse.rates, shipment]);
   const handleSave = useCallback(({
     carrierId,
     serviceCode