@shipengine/elements 0.26.4 → 0.26.6

package/index.cjs

@@ -26,7 +26,6 @@ var jsBase64 = require('js-base64');
 var cardValidator = require('card-validator');
 var reactQuery = require('react-query');
 var brands = require('@packlink/brands');
-var reactApi = require('@shipengine/react-api');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -2628,6 +2627,27 @@ const overrideCarrierCodes$1 = (carrier, overrides) => {
   return overrides[carrier] || carrier;
 };
 
+var $$f = _export;
+var $includes = arrayIncludes.includes;
+var fails$7 = fails$q;
+var addToUnscopables$1 = addToUnscopables$3;
+
+// FF99+ bug
+var BROKEN_ON_SPARSE = fails$7(function () {
+  return !Array(1).includes();
+});
+
+// `Array.prototype.includes` method
+// https://tc39.es/ecma262/#sec-array.prototype.includes
+$$f({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+  includes: function includes(el /* , fromIndex = 0 */) {
+    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
+  }
+});
+
+// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+addToUnscopables$1('includes');
+
 // Declaring these flags to allow shorthand object syntax, i.e. { flagName } instead of { flagName: true }
 const hasEuCustomsRules = true,
   hasProvinces = true,
@@ -2867,27 +2887,9 @@ const isPoBox = addressLine => PO_BOX_REGEX.test(addressLine);
  * @category Utilities
  */
 const isPoBoxAddress = address => !!(isPoBox(address.addressLine1) || address.addressLine2 && isPoBox(address.addressLine2));
-
-var $$f = _export;
-var $includes = arrayIncludes.includes;
-var fails$7 = fails$q;
-var addToUnscopables$1 = addToUnscopables$3;
-
-// FF99+ bug
-var BROKEN_ON_SPARSE = fails$7(function () {
-  return !Array(1).includes();
-});
-
-// `Array.prototype.includes` method
-// https://tc39.es/ecma262/#sec-array.prototype.includes
-$$f({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
-  includes: function includes(el /* , fromIndex = 0 */) {
-    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
-  }
-});
-
-// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-addToUnscopables$1('includes');
+const isEmptyAddress = address => {
+  return !address || Object.entries(address).every(([key, value]) => key === "countryCode" || [null, "", "unknown"].includes(value));
+};
 
 const USPS_CARRIER_CODES = ["usps", "stamps_com"];
 const isUspsCarrier = carrierCode => USPS_CARRIER_CODES.includes(carrierCode);
@@ -4801,11 +4803,15 @@ const CostBreakdown = ({
           children: [jsxRuntime.jsx("td", Object.assign({
             css: getTableCellLabelStyles
           }, {
-            children: priceItem.label
+            children: jsxRuntime.jsx(giger.Typography, {
+              children: priceItem.label
+            })
           })), jsxRuntime.jsx("td", Object.assign({
             "data-testid": priceItem.label.toLowerCase()
           }, {
-            children: formatMoney(priceItem.value)
+            children: jsxRuntime.jsx(giger.Typography, {
+              children: formatMoney(priceItem.value)
+            })
           }))]
         }, index + priceItem.value.amount))
       })
@@ -6560,6 +6566,10 @@ const styles$n = createStyles({
     display: "flex",
     flexDirection: "column"
   },
+  icon: theme => ({
+    padding: `${theme.spacing(0.4)}px 0 0 ${theme.spacing(0.5)}px`,
+    position: "absolute"
+  }),
   link: {
     border: "none"
   },
@@ -7255,6 +7265,11 @@ const CarrierTermsForm = ({
             children: jsxRuntime.jsx(CheckboxInput, {
               checkboxLabel: jsxRuntime.jsx(reactI18next.Trans, {
                 components: {
+                  icon: jsxRuntime.jsx(giger.Icon, {
+                    css: styles$n.icon,
+                    name: showTerms ? gigerTheme.IconNames.CHEVRON_TOP : gigerTheme.IconNames.CHEVRON_BOTTOM,
+                    size: giger.IconSize.SIZE_SMALL
+                  }),
                   terms: jsxRuntime.jsx(giger.Link, {
                     css: theme => ({
                       fontWeight: theme.typography.fontWeight.normal
@@ -12266,7 +12281,7 @@ const ShipmentForm = ({
   warehouseId,
   warehouses
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j;
   features = Object.assign({
     browseRates: true,
     includeShipsuranceInsurance: true,
@@ -12444,16 +12459,16 @@ const ShipmentForm = ({
   }, [form]);
   const handleSubmit = form.handleSubmit(values => __awaiter(void 0, void 0, void 0, function* () {
     try {
-      const _j = values,
+      const _k = values,
         {
           __mode: discard
-        } = _j,
-        payload = __rest(_j, ["__mode"]);
+        } = _k,
+        payload = __rest(_k, ["__mode"]);
       const updatedShipment = yield onSubmit(Object.assign(Object.assign({}, shipment || {}), payload));
       // Defer shipment hydration to the task queue so that the submission promise resolves first, otherwise the
       // submission count will increment after hydration resets the form, keeping it in revalidate mode
       if (updatedShipment) setTimeout(() => hydrateShipment(updatedShipment), 0);
-    } catch (_k) {
+    } catch (_l) {
       // Reset the form to its current state, but as a side effect this sets isDirty to false
       // That way, form lifecycle contract is upheld
       form.reset(form.getValues());
@@ -12536,7 +12551,7 @@ const ShipmentForm = ({
     }
   }), [form, onChangeAddress, shipment]);
   const [editShipToForm, isEditShipFormToOpen, toggleIsEditShipFormToOpen] = useNestedForm(AddressForm, {
-    address: (_a = shipment === null || shipment === void 0 ? void 0 : shipment.shipTo) !== null && _a !== void 0 ? _a : salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo,
+    address: (_b = (_a = addressPreference === null || addressPreference === void 0 ? void 0 : addressPreference.selection) !== null && _a !== void 0 ? _a : shipment === null || shipment === void 0 ? void 0 : shipment.shipTo) !== null && _b !== void 0 ? _b : salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo,
     formId: "edit-ship-to-form",
     onSubmit: handleSubmitEditShipTo,
     onSubmitParse: onSubmitParseShipTo
@@ -12586,7 +12601,7 @@ const ShipmentForm = ({
   });
   if (errors) throw new Error(errors.map(e => e.message).join(", "));
   if (!shipment) throw new Error("errorMessages.unableToLoad.shipment");
-  const isEmptyShipTo = Object.entries(shipment.shipTo).every(([key, value]) => key === "countryCode" || [null, "", "unknown"].includes(value));
+  const addressPreferenceIsEmpty = isEmptyAddress(addressPreference === null || addressPreference === void 0 ? void 0 : addressPreference.selection);
   return jsxRuntime.jsxs("form", Object.assign({
     id: "shipment-form",
     onSubmit: formLogger.capture(handleSubmit)
@@ -12610,7 +12625,7 @@ const ShipmentForm = ({
       }), jsxRuntime.jsx(FieldLabel, Object.assign({
         label: !isEditShipFormToOpen ? "purchase-label:fields.shipTo" : ""
       }, {
-        children: !isEditShipFormToOpen && (isEmptyShipTo ? jsxRuntime.jsx(giger.Button, Object.assign({
+        children: !isEditShipFormToOpen && (addressPreferenceIsEmpty ? jsxRuntime.jsx(giger.Button, Object.assign({
           onClick: toggleIsEditShipFormToOpen,
           variant: giger.ButtonVariant.OUTLINED
         }, {
@@ -12654,7 +12669,7 @@ const ShipmentForm = ({
         }, {
           children: formatDate(salesOrder.orderDate)
         })), jsxRuntime.jsx(Spacer, {})]
-      })), ((_b = salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.paymentDetails) === null || _b === void 0 ? void 0 : _b.grandTotal) && jsxRuntime.jsxs(FieldLabel, Object.assign({
+      })), ((_c = salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.paymentDetails) === null || _c === void 0 ? void 0 : _c.grandTotal) && jsxRuntime.jsxs(FieldLabel, Object.assign({
         label: t("purchase-label:fields.orderValue")
       }, {
         children: [jsxRuntime.jsx(giger.Typography, Object.assign({
@@ -12732,7 +12747,7 @@ const ShipmentForm = ({
       }), jsxRuntime.jsx(CustomsItemsDisplay, {
         onUpdate: handleUpdateCustomsItems,
         shipment: shipment
-      }), ((_c = customsErrors === null || customsErrors === void 0 ? void 0 : customsErrors.customsItems) === null || _c === void 0 ? void 0 : _c.type) === "too_small" && jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      }), ((_d = customsErrors === null || customsErrors === void 0 ? void 0 : customsErrors.customsItems) === null || _d === void 0 ? void 0 : _d.type) === "too_small" && jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [jsxRuntime.jsx(Spacer, {}), jsxRuntime.jsx(giger.InlineNotification, {
           title: t("purchase-label:errorMessages.customsItemsRequired"),
           type: giger.NotificationType.ERROR
@@ -12896,14 +12911,14 @@ const ShipmentForm = ({
         label: "purchase-label:fields.addOns"
       }, {
         children: [jsxRuntime.jsx(Switch, Object.assign({
-          defaultChecked: ((_d = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _d !== void 0 ? _d : "none") !== "none",
+          defaultChecked: ((_e = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _e !== void 0 ? _e : "none") !== "none",
           label: t("purchase-label:fields.confirmation"),
           name: "confirmationEnabled",
           onChange: e => form.setValue("confirmation", e.target.checked ? alchemy.SE.ConfirmationType.DELIVERY : undefined, {
             shouldDirty: true
           }),
           shouldUnmount: true,
-          value: ((_e = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _e !== void 0 ? _e : "none") !== "none"
+          value: ((_f = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _f !== void 0 ? _f : "none") !== "none"
         }, {
           children: jsxRuntime.jsx(Select, {
             control: form.control,
@@ -12915,7 +12930,7 @@ const ShipmentForm = ({
             shouldUnregister: true
           })
         })), jsxRuntime.jsxs(Switch, Object.assign({
-          defaultChecked: ((_f = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _f !== void 0 ? _f : "none") !== "none",
+          defaultChecked: ((_g = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _g !== void 0 ? _g : "none") !== "none",
           label: t("purchase-label:fields.insurance"),
           name: "insuranceEnabled",
           onChange: e => {
@@ -12925,7 +12940,7 @@ const ShipmentForm = ({
             });
           },
           shouldUnmount: true,
-          value: ((_g = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _g !== void 0 ? _g : "none") !== "none"
+          value: ((_h = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _h !== void 0 ? _h : "none") !== "none"
         }, {
           children: [insuranceProviderOptions.length === 1 && insuranceProviderOptions[0].value === "carrier" ? null : jsxRuntime.jsx(Select, {
             control: form.control,
@@ -12949,7 +12964,7 @@ const ShipmentForm = ({
             showCurrencySymbol: true
           })]
         })), hasUps && jsxRuntime.jsx(Switch, {
-          defaultChecked: ((_h = shipment === null || shipment === void 0 ? void 0 : shipment.advancedOptions) === null || _h === void 0 ? void 0 : _h.additionalHandling) || false,
+          defaultChecked: ((_j = shipment === null || shipment === void 0 ? void 0 : shipment.advancedOptions) === null || _j === void 0 ? void 0 : _j.additionalHandling) || false,
           label: jsxRuntime.jsx(reactI18next.Trans, {
             components: {
               Link: jsxRuntime.jsx(giger.Link, {
@@ -13783,7 +13798,7 @@ var common = {
 			agreement: "Agreement"
 		},
 		terms: {
-			agreeToTerms: "I agree to the <terms>Terms of Service</terms>",
+			agreeToTerms: "I agree to the <terms>Terms of Service<icon/></terms>",
 			title: "Terms of Service"
 		}
 	},
@@ -14687,7 +14702,9 @@ const useAddress = ({
     return updatedShipment;
   }), [handleValidateAddress, onChange, shipment, updateShipment]);
   React.useEffect(() => {
-    if (!addressPreference && (shipment === null || shipment === void 0 ? void 0 : shipment.shipTo)) {
+    if (!addressPreference && (shipment === null || shipment === void 0 ? void 0 : shipment.shipTo) &&
+    // without this check it will keep reverting a one-off label's address preference back to empty for some reason
+    !isEmptyAddress(shipment === null || shipment === void 0 ? void 0 : shipment.shipTo)) {
       void handleValidateAddress(shipment === null || shipment === void 0 ? void 0 : shipment.shipTo, salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo);
     }
   }, [addressPreference, handleValidateAddress, salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo, shipment === null || shipment === void 0 ? void 0 : shipment.shipTo]);
@@ -15473,67 +15490,42 @@ const PurchaseLabelBySalesOrder = _a => {
   }));
 };
 
-let shipmentsCreated = 0;
-const useGetOrCreateShipment = shipmentId => {
-  const {
-    client
-  } = alchemy.useShipEngine();
-  const shipmentCreation = React.useMemo(() => {
-    return ++shipmentsCreated;
-  },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  []);
-  return reactQuery.useQuery({
-    onError: reactApi.onError,
-    queryFn: () => __awaiter(void 0, void 0, void 0, function* () {
-      var _a;
-      if (shipmentId) {
-        return (yield client.salesOrderShipments.get(shipmentId)).data;
-      } else {
-        const warehouses = (yield client.warehouses.list()).data.warehouses;
-        const defaultOrFirstWarehouse = (_a = warehouses.find(warehouse => warehouse.isDefault)) !== null && _a !== void 0 ? _a : warehouses[0];
-        if (defaultOrFirstWarehouse === undefined) {
-          throw [alchemy.CodedError.fromObject({
-            errorCode: "unknown",
-            errorSource: "client",
-            errorType: "unknown",
-            message: "errorMessages.noWarehouses"
-          })];
-        }
-        const shipTo = {
-          addressLine1: "",
-          cityLocality: "",
-          countryCode: "",
-          name: "",
-          phone: "",
-          postalCode: "",
-          stateProvince: ""
-        };
-        const newShipment = yield client.shipments.create({
-          shipTo: shipTo,
-          warehouseId: defaultOrFirstWarehouse.warehouseId
-        });
-        return newShipment.data.shipments[0];
-      }
-    }),
-    queryKey: ["useGetOrCreateShipment", shipmentId || `--${shipmentCreation}`],
-    retry: shipmentId !== undefined
-  });
+const getDefaultWarehouse = warehouses => {
+  var _a;
+  return (_a = warehouses === null || warehouses === void 0 ? void 0 : warehouses.find(w => w.isDefault)) !== null && _a !== void 0 ? _a : warehouses === null || warehouses === void 0 ? void 0 : warehouses[0];
 };
 
-const useLoadOrCreateShipment = shipmentId => {
+const useGetOrCreateShipment = shipmentId => {
+  var _a, _b;
   const {
-    data: shipment,
-    error: loadShipmentErrors,
-    refetch: refetchShipment,
-    isLoading
-  } = useGetOrCreateShipment(shipmentId);
-  const errors = [...(loadShipmentErrors !== null && loadShipmentErrors !== void 0 ? loadShipmentErrors : [])];
+    data: warehouses
+  } = alchemy.useListWarehouses({
+    enabled: shipmentId === undefined
+  });
+  const createShipment = alchemy.useCreateShipment();
+  // useCreateShipment as called by this hook will only ever create one shipment at a time,
+  // lens it for convenience
+  const createdShipment = React.useMemo(() => {
+    var _a, _b;
+    return (_b = (_a = createShipment.data) === null || _a === void 0 ? void 0 : _a.shipments) === null || _b === void 0 ? void 0 : _b[0];
+  }, [createShipment.data]);
+  // If no shipmentId passed, trigger create shipment mutation
+  React.useEffect(() => {
+    if (warehouses && shipmentId === undefined && !createShipment.isLoading && !createdShipment) {
+      createShipment.mutate({
+        warehouseId: getDefaultWarehouse(warehouses).warehouseId
+      });
+    }
+  }, [warehouses, shipmentId, createShipment, createdShipment]);
+  const getShipment = alchemy.useGetShipment(shipmentId !== null && shipmentId !== void 0 ? shipmentId : createdShipment === null || createdShipment === void 0 ? void 0 : createdShipment.shipmentId);
+  const errors = [...((_a = getShipment.error) !== null && _a !== void 0 ? _a : []), ...((_b = createShipment.error) !== null && _b !== void 0 ? _b : [])];
   return {
     errors: errors.length > 0 ? errors : undefined,
-    isLoading: isLoading,
-    refetchShipment,
-    shipment
+    isLoading:
+    //bootstrap isLoading to true if one off and create shipment mutation hasn't been triggered yet
+    !createShipment.isError && createShipment.isIdle && shipmentId === undefined || getShipment.isLoading || createShipment.isLoading,
+    refetchShipment: getShipment.refetch,
+    shipment: getShipment.data
   };
 };
 
@@ -15541,36 +15533,26 @@ const PurchaseLabelByShipment = _a => {
   var {
       onLoad,
       onShipmentUpdated,
-      features
+      shipmentId
     } = _a,
-    props = __rest(_a, ["onLoad", "onShipmentUpdated", "features"]);
-  const _b = useLoadOrCreateShipment("shipmentId" in props ? props.shipmentId : undefined),
+    props = __rest(_a, ["onLoad", "onShipmentUpdated", "shipmentId"]);
+  const _b = useGetOrCreateShipment(shipmentId),
     {
       shipment
     } = _b,
     shipmentProps = __rest(_b, ["shipment"]);
+  const handleShipmentUpdated = shipment => {
+    void shipmentProps.refetchShipment();
+    onShipmentUpdated === null || onShipmentUpdated === void 0 ? void 0 : onShipmentUpdated(shipment);
+  };
   return jsxRuntime.jsx(SuspendShipment, Object.assign({
     shipment: shipment
   }, shipmentProps, {
     children: shipment && jsxRuntime.jsx(ConfigureShipment, Object.assign({
       errors: shipmentProps.errors,
-      features: features,
       isLoading: shipmentProps.isLoading,
-      onAddressValidation: props.onAddressValidation,
-      onApplyPreset: props.onApplyPreset,
-      onBeforeLabelCreate: props.onBeforeLabelCreate,
-      onChangeAddress: props.onChangeAddress,
-      onChangeShipmentFormMode: props.onChangeShipmentFormMode,
-      onLabelCreateFailure: props.onLabelCreateFailure,
-      onLabelCreateSuccess: props.onLabelCreateSuccess,
-      onRateSaved: props.onRateSaved,
-      onRatesCalculated: props.onRatesCalculated,
-      onShipmentUpdated: onShipmentUpdated,
-      onToggleAddressPreferenceDisclosure: props.onToggleAddressPreferenceDisclosure,
-      printLabelLayout: props.printLabelLayout,
-      shipment: shipment,
-      shippingPresets: props.shippingPresets,
-      warehouseId: props.warehouseId
+      onShipmentUpdated: handleShipmentUpdated,
+      shipment: shipment
     }, props))
   }));
 };
@@ -15899,6 +15881,7 @@ exports.getRequestedServices = getRequestedServices;
 exports.getSalesOrderItemsFromSalesOrderOrShipment = getSalesOrderItemsFromSalesOrderOrShipment;
 exports.getTotalRateAmount = getTotalRateAmount;
 exports.isDomesticAddress = isDomesticAddress;
+exports.isEmptyAddress = isEmptyAddress;
 exports.isFlatRatePackageCode = isFlatRatePackageCode;
 exports.isMilitaryAddress = isMilitaryAddress;
 exports.isNowOrInTheFuture = isNowOrInTheFuture;

package/index.js

@@ -1,9 +1,9 @@
 import { jsx, jsxs, Fragment } from '@emotion/react/jsx-runtime';
 import { useController, get as get$1, set as set$2, useWatch, useFormState, useForm } from 'react-hook-form';
 import { useTranslation, Trans } from 'react-i18next';
-import { Typography, FormField, FieldMessageType, Checkbox, Input, Icon, Divider, Link, SelectAutocomplete, Select as Select$1, OptionGroup, Option, Button, Switch as Switch$1, Textarea, ButtonVariant, InlineNotification, NotificationType, ButtonColor, Grid, GridChild, Tag, TagColor, ButtonSize, Spinner, IconSize, Skeleton, SkeletonAnimation, SkeletonVariant, SkeletonBackgroundColor, RadioGroup, Radio, Stepper, Step, SpinnerSize, ChipList, Chip, Table, TableBody, TableBaseRow, TableBodyCell, TableHeader, TableHeaderCell, Popover, DropdownOptionList, DatePicker as DatePicker$1, BottomSheet } from '@packlink/giger';
+import { Typography, FormField, FieldMessageType, Checkbox, Input, Icon, Divider, Link, SelectAutocomplete, Select as Select$1, OptionGroup, Option, Button, Switch as Switch$1, Textarea, ButtonVariant, InlineNotification, NotificationType, ButtonColor, Grid, GridChild, Tag, TagColor, IconSize, ButtonSize, Spinner, Skeleton, SkeletonAnimation, SkeletonVariant, SkeletonBackgroundColor, RadioGroup, Radio, Stepper, Step, SpinnerSize, ChipList, Chip, Table, TableBody, TableBaseRow, TableBodyCell, TableHeader, TableHeaderCell, Popover, DropdownOptionList, DatePicker as DatePicker$1, BottomSheet } from '@packlink/giger';
 import axios from 'axios';
-import alchemy, { logger, SE, useValidateAddresses, useAddFunds, useGetCarrierById, useGetAccountSettings, useUpdateAccountSettings, useUpdateAutoFunding, useGetAutoFundingConfiguration, Currency, useListCarriers, useConnectCarrier, useListWarehouses, useUpdateWarehouse, useCreateWarehouse, useDeleteWarehouse, useUpdateSalesOrderShipment, useParseAddress, useListCustomPackageTypes, useCalculateRates, useGetShipmentRates, useListLabels, useCreateLabel, useListSalesOrderShipments, useCreateSalesOrderShipment, useListSalesOrders, useGetSalesOrder, useListOrderSources, useRefreshOrderSource, useShipEngine, CodedError, useGetSalesOrderShipment, useGetLabel, useVoidLabel } from '@shipengine/alchemy';
+import alchemy, { logger, SE, useValidateAddresses, useAddFunds, useGetCarrierById, useGetAccountSettings, useUpdateAccountSettings, useUpdateAutoFunding, useGetAutoFundingConfiguration, Currency, useListCarriers, useConnectCarrier, useListWarehouses, useUpdateWarehouse, useCreateWarehouse, useDeleteWarehouse, useUpdateSalesOrderShipment, useParseAddress, useListCustomPackageTypes, useCalculateRates, useGetShipmentRates, useListLabels, useCreateLabel, useListSalesOrderShipments, useCreateSalesOrderShipment, useListSalesOrders, useGetSalesOrder, useListOrderSources, useRefreshOrderSource, useCreateShipment, useGetShipment, useGetSalesOrderShipment, useGetLabel, useVoidLabel } from '@shipengine/alchemy';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import * as React from 'react';
@@ -21,9 +21,8 @@ import { isValidPhoneNumber } from 'libphonenumber-js/min';
 import copy from 'copy-to-clipboard';
 import { encode } from 'js-base64';
 import cardValidator from 'card-validator';
-import { useQueryClient, useQuery } from 'react-query';
+import { useQueryClient } from 'react-query';
 import { IconNames as IconNames$1 } from '@packlink/brands';
-import { onError } from '@shipengine/react-api';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -2596,6 +2595,27 @@ const overrideCarrierCodes$1 = (carrier, overrides) => {
   return overrides[carrier] || carrier;
 };
 
+var $$f = _export;
+var $includes = arrayIncludes.includes;
+var fails$7 = fails$q;
+var addToUnscopables$1 = addToUnscopables$3;
+
+// FF99+ bug
+var BROKEN_ON_SPARSE = fails$7(function () {
+  return !Array(1).includes();
+});
+
+// `Array.prototype.includes` method
+// https://tc39.es/ecma262/#sec-array.prototype.includes
+$$f({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+  includes: function includes(el /* , fromIndex = 0 */) {
+    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
+  }
+});
+
+// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+addToUnscopables$1('includes');
+
 // Declaring these flags to allow shorthand object syntax, i.e. { flagName } instead of { flagName: true }
 const hasEuCustomsRules = true,
   hasProvinces = true,
@@ -2835,27 +2855,9 @@ const isPoBox = addressLine => PO_BOX_REGEX.test(addressLine);
  * @category Utilities
  */
 const isPoBoxAddress = address => !!(isPoBox(address.addressLine1) || address.addressLine2 && isPoBox(address.addressLine2));
-
-var $$f = _export;
-var $includes = arrayIncludes.includes;
-var fails$7 = fails$q;
-var addToUnscopables$1 = addToUnscopables$3;
-
-// FF99+ bug
-var BROKEN_ON_SPARSE = fails$7(function () {
-  return !Array(1).includes();
-});
-
-// `Array.prototype.includes` method
-// https://tc39.es/ecma262/#sec-array.prototype.includes
-$$f({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
-  includes: function includes(el /* , fromIndex = 0 */) {
-    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
-  }
-});
-
-// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-addToUnscopables$1('includes');
+const isEmptyAddress = address => {
+  return !address || Object.entries(address).every(([key, value]) => key === "countryCode" || [null, "", "unknown"].includes(value));
+};
 
 const USPS_CARRIER_CODES = ["usps", "stamps_com"];
 const isUspsCarrier = carrierCode => USPS_CARRIER_CODES.includes(carrierCode);
@@ -4769,11 +4771,15 @@ const CostBreakdown = ({
           children: [jsx("td", Object.assign({
             css: getTableCellLabelStyles
           }, {
-            children: priceItem.label
+            children: jsx(Typography, {
+              children: priceItem.label
+            })
           })), jsx("td", Object.assign({
             "data-testid": priceItem.label.toLowerCase()
           }, {
-            children: formatMoney(priceItem.value)
+            children: jsx(Typography, {
+              children: formatMoney(priceItem.value)
+            })
           }))]
         }, index + priceItem.value.amount))
       })
@@ -6528,6 +6534,10 @@ const styles$n = createStyles({
     display: "flex",
     flexDirection: "column"
   },
+  icon: theme => ({
+    padding: `${theme.spacing(0.4)}px 0 0 ${theme.spacing(0.5)}px`,
+    position: "absolute"
+  }),
   link: {
     border: "none"
   },
@@ -7223,6 +7233,11 @@ const CarrierTermsForm = ({
             children: jsx(CheckboxInput, {
               checkboxLabel: jsx(Trans, {
                 components: {
+                  icon: jsx(Icon, {
+                    css: styles$n.icon,
+                    name: showTerms ? IconNames.CHEVRON_TOP : IconNames.CHEVRON_BOTTOM,
+                    size: IconSize.SIZE_SMALL
+                  }),
                   terms: jsx(Link, {
                     css: theme => ({
                       fontWeight: theme.typography.fontWeight.normal
@@ -12234,7 +12249,7 @@ const ShipmentForm = ({
   warehouseId,
   warehouses
 }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j;
   features = Object.assign({
     browseRates: true,
     includeShipsuranceInsurance: true,
@@ -12412,16 +12427,16 @@ const ShipmentForm = ({
   }, [form]);
   const handleSubmit = form.handleSubmit(values => __awaiter(void 0, void 0, void 0, function* () {
     try {
-      const _j = values,
+      const _k = values,
         {
           __mode: discard
-        } = _j,
-        payload = __rest(_j, ["__mode"]);
+        } = _k,
+        payload = __rest(_k, ["__mode"]);
       const updatedShipment = yield onSubmit(Object.assign(Object.assign({}, shipment || {}), payload));
       // Defer shipment hydration to the task queue so that the submission promise resolves first, otherwise the
       // submission count will increment after hydration resets the form, keeping it in revalidate mode
       if (updatedShipment) setTimeout(() => hydrateShipment(updatedShipment), 0);
-    } catch (_k) {
+    } catch (_l) {
       // Reset the form to its current state, but as a side effect this sets isDirty to false
       // That way, form lifecycle contract is upheld
       form.reset(form.getValues());
@@ -12504,7 +12519,7 @@ const ShipmentForm = ({
     }
   }), [form, onChangeAddress, shipment]);
   const [editShipToForm, isEditShipFormToOpen, toggleIsEditShipFormToOpen] = useNestedForm(AddressForm, {
-    address: (_a = shipment === null || shipment === void 0 ? void 0 : shipment.shipTo) !== null && _a !== void 0 ? _a : salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo,
+    address: (_b = (_a = addressPreference === null || addressPreference === void 0 ? void 0 : addressPreference.selection) !== null && _a !== void 0 ? _a : shipment === null || shipment === void 0 ? void 0 : shipment.shipTo) !== null && _b !== void 0 ? _b : salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo,
     formId: "edit-ship-to-form",
     onSubmit: handleSubmitEditShipTo,
     onSubmitParse: onSubmitParseShipTo
@@ -12554,7 +12569,7 @@ const ShipmentForm = ({
   });
   if (errors) throw new Error(errors.map(e => e.message).join(", "));
   if (!shipment) throw new Error("errorMessages.unableToLoad.shipment");
-  const isEmptyShipTo = Object.entries(shipment.shipTo).every(([key, value]) => key === "countryCode" || [null, "", "unknown"].includes(value));
+  const addressPreferenceIsEmpty = isEmptyAddress(addressPreference === null || addressPreference === void 0 ? void 0 : addressPreference.selection);
   return jsxs("form", Object.assign({
     id: "shipment-form",
     onSubmit: formLogger.capture(handleSubmit)
@@ -12578,7 +12593,7 @@ const ShipmentForm = ({
       }), jsx(FieldLabel, Object.assign({
         label: !isEditShipFormToOpen ? "purchase-label:fields.shipTo" : ""
       }, {
-        children: !isEditShipFormToOpen && (isEmptyShipTo ? jsx(Button, Object.assign({
+        children: !isEditShipFormToOpen && (addressPreferenceIsEmpty ? jsx(Button, Object.assign({
           onClick: toggleIsEditShipFormToOpen,
           variant: ButtonVariant.OUTLINED
         }, {
@@ -12622,7 +12637,7 @@ const ShipmentForm = ({
         }, {
           children: formatDate(salesOrder.orderDate)
         })), jsx(Spacer, {})]
-      })), ((_b = salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.paymentDetails) === null || _b === void 0 ? void 0 : _b.grandTotal) && jsxs(FieldLabel, Object.assign({
+      })), ((_c = salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.paymentDetails) === null || _c === void 0 ? void 0 : _c.grandTotal) && jsxs(FieldLabel, Object.assign({
         label: t("purchase-label:fields.orderValue")
       }, {
         children: [jsx(Typography, Object.assign({
@@ -12700,7 +12715,7 @@ const ShipmentForm = ({
       }), jsx(CustomsItemsDisplay, {
         onUpdate: handleUpdateCustomsItems,
         shipment: shipment
-      }), ((_c = customsErrors === null || customsErrors === void 0 ? void 0 : customsErrors.customsItems) === null || _c === void 0 ? void 0 : _c.type) === "too_small" && jsxs(Fragment, {
+      }), ((_d = customsErrors === null || customsErrors === void 0 ? void 0 : customsErrors.customsItems) === null || _d === void 0 ? void 0 : _d.type) === "too_small" && jsxs(Fragment, {
         children: [jsx(Spacer, {}), jsx(InlineNotification, {
           title: t("purchase-label:errorMessages.customsItemsRequired"),
           type: NotificationType.ERROR
@@ -12864,14 +12879,14 @@ const ShipmentForm = ({
         label: "purchase-label:fields.addOns"
       }, {
         children: [jsx(Switch, Object.assign({
-          defaultChecked: ((_d = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _d !== void 0 ? _d : "none") !== "none",
+          defaultChecked: ((_e = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _e !== void 0 ? _e : "none") !== "none",
           label: t("purchase-label:fields.confirmation"),
           name: "confirmationEnabled",
           onChange: e => form.setValue("confirmation", e.target.checked ? SE.ConfirmationType.DELIVERY : undefined, {
             shouldDirty: true
           }),
           shouldUnmount: true,
-          value: ((_e = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _e !== void 0 ? _e : "none") !== "none"
+          value: ((_f = shipment === null || shipment === void 0 ? void 0 : shipment.confirmation) !== null && _f !== void 0 ? _f : "none") !== "none"
         }, {
           children: jsx(Select, {
             control: form.control,
@@ -12883,7 +12898,7 @@ const ShipmentForm = ({
             shouldUnregister: true
           })
         })), jsxs(Switch, Object.assign({
-          defaultChecked: ((_f = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _f !== void 0 ? _f : "none") !== "none",
+          defaultChecked: ((_g = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _g !== void 0 ? _g : "none") !== "none",
           label: t("purchase-label:fields.insurance"),
           name: "insuranceEnabled",
           onChange: e => {
@@ -12893,7 +12908,7 @@ const ShipmentForm = ({
             });
           },
           shouldUnmount: true,
-          value: ((_g = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _g !== void 0 ? _g : "none") !== "none"
+          value: ((_h = shipment === null || shipment === void 0 ? void 0 : shipment.insuranceProvider) !== null && _h !== void 0 ? _h : "none") !== "none"
         }, {
           children: [insuranceProviderOptions.length === 1 && insuranceProviderOptions[0].value === "carrier" ? null : jsx(Select, {
             control: form.control,
@@ -12917,7 +12932,7 @@ const ShipmentForm = ({
             showCurrencySymbol: true
           })]
         })), hasUps && jsx(Switch, {
-          defaultChecked: ((_h = shipment === null || shipment === void 0 ? void 0 : shipment.advancedOptions) === null || _h === void 0 ? void 0 : _h.additionalHandling) || false,
+          defaultChecked: ((_j = shipment === null || shipment === void 0 ? void 0 : shipment.advancedOptions) === null || _j === void 0 ? void 0 : _j.additionalHandling) || false,
           label: jsx(Trans, {
             components: {
               Link: jsx(Link, {
@@ -13751,7 +13766,7 @@ var common = {
 			agreement: "Agreement"
 		},
 		terms: {
-			agreeToTerms: "I agree to the <terms>Terms of Service</terms>",
+			agreeToTerms: "I agree to the <terms>Terms of Service<icon/></terms>",
 			title: "Terms of Service"
 		}
 	},
@@ -14655,7 +14670,9 @@ const useAddress = ({
     return updatedShipment;
   }), [handleValidateAddress, onChange, shipment, updateShipment]);
   useEffect(() => {
-    if (!addressPreference && (shipment === null || shipment === void 0 ? void 0 : shipment.shipTo)) {
+    if (!addressPreference && (shipment === null || shipment === void 0 ? void 0 : shipment.shipTo) &&
+    // without this check it will keep reverting a one-off label's address preference back to empty for some reason
+    !isEmptyAddress(shipment === null || shipment === void 0 ? void 0 : shipment.shipTo)) {
       void handleValidateAddress(shipment === null || shipment === void 0 ? void 0 : shipment.shipTo, salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo);
     }
   }, [addressPreference, handleValidateAddress, salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.shipTo, shipment === null || shipment === void 0 ? void 0 : shipment.shipTo]);
@@ -15441,67 +15458,42 @@ const PurchaseLabelBySalesOrder = _a => {
   }));
 };
 
-let shipmentsCreated = 0;
-const useGetOrCreateShipment = shipmentId => {
-  const {
-    client
-  } = useShipEngine();
-  const shipmentCreation = useMemo(() => {
-    return ++shipmentsCreated;
-  },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  []);
-  return useQuery({
-    onError,
-    queryFn: () => __awaiter(void 0, void 0, void 0, function* () {
-      var _a;
-      if (shipmentId) {
-        return (yield client.salesOrderShipments.get(shipmentId)).data;
-      } else {
-        const warehouses = (yield client.warehouses.list()).data.warehouses;
-        const defaultOrFirstWarehouse = (_a = warehouses.find(warehouse => warehouse.isDefault)) !== null && _a !== void 0 ? _a : warehouses[0];
-        if (defaultOrFirstWarehouse === undefined) {
-          throw [CodedError.fromObject({
-            errorCode: "unknown",
-            errorSource: "client",
-            errorType: "unknown",
-            message: "errorMessages.noWarehouses"
-          })];
-        }
-        const shipTo = {
-          addressLine1: "",
-          cityLocality: "",
-          countryCode: "",
-          name: "",
-          phone: "",
-          postalCode: "",
-          stateProvince: ""
-        };
-        const newShipment = yield client.shipments.create({
-          shipTo: shipTo,
-          warehouseId: defaultOrFirstWarehouse.warehouseId
-        });
-        return newShipment.data.shipments[0];
-      }
-    }),
-    queryKey: ["useGetOrCreateShipment", shipmentId || `--${shipmentCreation}`],
-    retry: shipmentId !== undefined
-  });
+const getDefaultWarehouse = warehouses => {
+  var _a;
+  return (_a = warehouses === null || warehouses === void 0 ? void 0 : warehouses.find(w => w.isDefault)) !== null && _a !== void 0 ? _a : warehouses === null || warehouses === void 0 ? void 0 : warehouses[0];
 };
 
-const useLoadOrCreateShipment = shipmentId => {
+const useGetOrCreateShipment = shipmentId => {
+  var _a, _b;
   const {
-    data: shipment,
-    error: loadShipmentErrors,
-    refetch: refetchShipment,
-    isLoading
-  } = useGetOrCreateShipment(shipmentId);
-  const errors = [...(loadShipmentErrors !== null && loadShipmentErrors !== void 0 ? loadShipmentErrors : [])];
+    data: warehouses
+  } = useListWarehouses({
+    enabled: shipmentId === undefined
+  });
+  const createShipment = useCreateShipment();
+  // useCreateShipment as called by this hook will only ever create one shipment at a time,
+  // lens it for convenience
+  const createdShipment = useMemo(() => {
+    var _a, _b;
+    return (_b = (_a = createShipment.data) === null || _a === void 0 ? void 0 : _a.shipments) === null || _b === void 0 ? void 0 : _b[0];
+  }, [createShipment.data]);
+  // If no shipmentId passed, trigger create shipment mutation
+  useEffect(() => {
+    if (warehouses && shipmentId === undefined && !createShipment.isLoading && !createdShipment) {
+      createShipment.mutate({
+        warehouseId: getDefaultWarehouse(warehouses).warehouseId
+      });
+    }
+  }, [warehouses, shipmentId, createShipment, createdShipment]);
+  const getShipment = useGetShipment(shipmentId !== null && shipmentId !== void 0 ? shipmentId : createdShipment === null || createdShipment === void 0 ? void 0 : createdShipment.shipmentId);
+  const errors = [...((_a = getShipment.error) !== null && _a !== void 0 ? _a : []), ...((_b = createShipment.error) !== null && _b !== void 0 ? _b : [])];
   return {
     errors: errors.length > 0 ? errors : undefined,
-    isLoading: isLoading,
-    refetchShipment,
-    shipment
+    isLoading:
+    //bootstrap isLoading to true if one off and create shipment mutation hasn't been triggered yet
+    !createShipment.isError && createShipment.isIdle && shipmentId === undefined || getShipment.isLoading || createShipment.isLoading,
+    refetchShipment: getShipment.refetch,
+    shipment: getShipment.data
   };
 };
 
@@ -15509,36 +15501,26 @@ const PurchaseLabelByShipment = _a => {
   var {
       onLoad,
       onShipmentUpdated,
-      features
+      shipmentId
     } = _a,
-    props = __rest(_a, ["onLoad", "onShipmentUpdated", "features"]);
-  const _b = useLoadOrCreateShipment("shipmentId" in props ? props.shipmentId : undefined),
+    props = __rest(_a, ["onLoad", "onShipmentUpdated", "shipmentId"]);
+  const _b = useGetOrCreateShipment(shipmentId),
     {
       shipment
     } = _b,
     shipmentProps = __rest(_b, ["shipment"]);
+  const handleShipmentUpdated = shipment => {
+    void shipmentProps.refetchShipment();
+    onShipmentUpdated === null || onShipmentUpdated === void 0 ? void 0 : onShipmentUpdated(shipment);
+  };
   return jsx(SuspendShipment, Object.assign({
     shipment: shipment
   }, shipmentProps, {
     children: shipment && jsx(ConfigureShipment, Object.assign({
       errors: shipmentProps.errors,
-      features: features,
       isLoading: shipmentProps.isLoading,
-      onAddressValidation: props.onAddressValidation,
-      onApplyPreset: props.onApplyPreset,
-      onBeforeLabelCreate: props.onBeforeLabelCreate,
-      onChangeAddress: props.onChangeAddress,
-      onChangeShipmentFormMode: props.onChangeShipmentFormMode,
-      onLabelCreateFailure: props.onLabelCreateFailure,
-      onLabelCreateSuccess: props.onLabelCreateSuccess,
-      onRateSaved: props.onRateSaved,
-      onRatesCalculated: props.onRatesCalculated,
-      onShipmentUpdated: onShipmentUpdated,
-      onToggleAddressPreferenceDisclosure: props.onToggleAddressPreferenceDisclosure,
-      printLabelLayout: props.printLabelLayout,
-      shipment: shipment,
-      shippingPresets: props.shippingPresets,
-      warehouseId: props.warehouseId
+      onShipmentUpdated: handleShipmentUpdated,
+      shipment: shipment
     }, props))
   }));
 };
@@ -15796,4 +15778,4 @@ var voidLabel = /*#__PURE__*/Object.freeze({
 	Element: Element
 });
 
-export { AddFundsForm, AutoFundingForm, ButtonGroup, CarrierBalance, CopyButton, Country, Cube, DateRangeCombo, DateRangeSelect, ErrorFallback, fields as Field, FieldLabel, FormPortal, FundAndPurchase, InlineLabel, ItemsBreakdown, LinkAction, listCarriers as ListCarriers, Loader, ManageFunding, manageWarehouses as ManageWarehouses, onboarding as Onboarding, PageLayoutProvider, Portal, PoweredByShipEngine, purchaseLabel as PurchaseLabel, RootPortalProvider, Section, Spacer, Spread, StoryNotes, index as Templates, UsState, UsaCity, viewShipment as ViewShipment, voidLabel as VoidLabel, autoFundingSchema, calculateTotal, capitalizeFirstLetter, convertDimensions, convertWeight, countries, countryCodes, createCodedErrors, createDictionary, createStyles, currencySymbol, daysAfter, errorMap, euCountryCodes, extendZod, formLogger, formatCreditCardNumber, formatDate, formatDateDDMMYY, formatExpiration, formatFractionalWeight, formatMoney, getAddFundsSchema, getCustomsFromSalesOrder, getExpirationYears, getIsCustomsRequiredForSalesOrder, getIsCustomsRequiredForShipment, getIsInternationalShipment, getPendingShipment, getRateRequiresAcknowledgement, getRelativeDates, getRequestedServices, getSalesOrderItemsFromSalesOrderOrShipment, getTotalRateAmount, isDomesticAddress, isFlatRatePackageCode, isMilitaryAddress, isNowOrInTheFuture, isPoBox, isPoBoxAddress, isString, isUnitedStatesTerritory, isUnsupportedByUps, isUpsCarrier, isUspsCarrier, moneySchema, mostRecent, nextDayCutoff, omitTime, overrideCarrierCodes$1 as overrideCarrierCodes, phoneSchema, phoneSchemaUnvalidated, postalCodeRegex$3 as postalCodeRegex, sortByCreationDate, throwAny, throwJoinedMessages, usCities, usStateCodes, usStates, useAddressValidation, useCarrierMetadata, useConfirmationOptions, useCountryCodeOptions, useCustomsContentsOptions, useCustomsNonDeliveryOptions, useDateRangeOptions, useExpirationMonthOptions, useInsuranceProviderOptions, useNestedForm, usePackageOptions, usePageLayout, useRateOptions, useRootPortal, useRunOnceOnTrue, useServiceCodeOptions, useShipmentMetadata, useShippingPresetsOptions, useStateCodeOptions, useToggle, useWarehouseOptions, validationResolver };
+export { AddFundsForm, AutoFundingForm, ButtonGroup, CarrierBalance, CopyButton, Country, Cube, DateRangeCombo, DateRangeSelect, ErrorFallback, fields as Field, FieldLabel, FormPortal, FundAndPurchase, InlineLabel, ItemsBreakdown, LinkAction, listCarriers as ListCarriers, Loader, ManageFunding, manageWarehouses as ManageWarehouses, onboarding as Onboarding, PageLayoutProvider, Portal, PoweredByShipEngine, purchaseLabel as PurchaseLabel, RootPortalProvider, Section, Spacer, Spread, StoryNotes, index as Templates, UsState, UsaCity, viewShipment as ViewShipment, voidLabel as VoidLabel, autoFundingSchema, calculateTotal, capitalizeFirstLetter, convertDimensions, convertWeight, countries, countryCodes, createCodedErrors, createDictionary, createStyles, currencySymbol, daysAfter, errorMap, euCountryCodes, extendZod, formLogger, formatCreditCardNumber, formatDate, formatDateDDMMYY, formatExpiration, formatFractionalWeight, formatMoney, getAddFundsSchema, getCustomsFromSalesOrder, getExpirationYears, getIsCustomsRequiredForSalesOrder, getIsCustomsRequiredForShipment, getIsInternationalShipment, getPendingShipment, getRateRequiresAcknowledgement, getRelativeDates, getRequestedServices, getSalesOrderItemsFromSalesOrderOrShipment, getTotalRateAmount, isDomesticAddress, isEmptyAddress, isFlatRatePackageCode, isMilitaryAddress, isNowOrInTheFuture, isPoBox, isPoBoxAddress, isString, isUnitedStatesTerritory, isUnsupportedByUps, isUpsCarrier, isUspsCarrier, moneySchema, mostRecent, nextDayCutoff, omitTime, overrideCarrierCodes$1 as overrideCarrierCodes, phoneSchema, phoneSchemaUnvalidated, postalCodeRegex$3 as postalCodeRegex, sortByCreationDate, throwAny, throwJoinedMessages, usCities, usStateCodes, usStates, useAddressValidation, useCarrierMetadata, useConfirmationOptions, useCountryCodeOptions, useCustomsContentsOptions, useCustomsNonDeliveryOptions, useDateRangeOptions, useExpirationMonthOptions, useInsuranceProviderOptions, useNestedForm, usePackageOptions, usePageLayout, useRateOptions, useRootPortal, useRunOnceOnTrue, useServiceCodeOptions, useShipmentMetadata, useShippingPresetsOptions, useStateCodeOptions, useToggle, useWarehouseOptions, validationResolver };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipengine/elements",
-  "version": "0.26.4",
+  "version": "0.26.6",
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "readmeFile": "../../README.md",
@@ -30,9 +30,8 @@
     "@jest/globals": "28.1.3",
     "@packlink/brands": "3.24.0",
     "@packlink/giger-theme": "1.3.1",
-    "@shipengine/alchemy": "0.4.18",
-    "@shipengine/js-api": "0.10.0",
-    "@shipengine/react-api": "0.5.6",
+    "@shipengine/alchemy": "0.4.24",
+    "@shipengine/js-api": "0.13.1",
     "@storybook/addons": "6.5.16",
     "@storybook/components": "7.0.0-rc.1",
     "@storybook/core-events": "7.0.0-rc.1",

package/src/components/templates/carrier-terms-form/carrier-terms-form.styles.d.ts

@@ -18,6 +18,10 @@ export declare const styles: {
         display: "flex";
         flexDirection: "column";
     };
+    icon: (theme: import("@packlink/giger-theme/dist/lib/Theme").Theme) => {
+        padding: string;
+        position: "absolute";
+    };
     link: {
         border: string;
     };

package/src/elements/purchase-label/purchase-label-by-sales-order.d.ts

@@ -1,26 +1,9 @@
-import { UseShippingPresetsOptionsProps } from "../../hooks";
-import { ConfigureShipmentProps } from "../configure-shipment";
-import { UseConfigureShipmentProps, UseImportSalesOrderProps } from "./hooks";
-export type SalesOrderProps = {
+import { UseImportSalesOrderProps } from "./hooks";
+import { PurchaseLabelCommonProps } from "./purchase-label";
+export type PurchaseLabelSalesOrderProps = PurchaseLabelCommonProps & {
     externalOrderId?: UseImportSalesOrderProps["externalOrderId"];
     externalOrderNumber?: UseImportSalesOrderProps["externalOrderNumber"];
-    features?: ConfigureShipmentProps["features"];
-    onAddressValidation?: ConfigureShipmentProps["onAddressValidation"];
-    onApplyPreset?: ConfigureShipmentProps["onApplyPreset"];
-    onBeforeLabelCreate?: ConfigureShipmentProps["onBeforeLabelCreate"];
-    onChangeAddress?: ConfigureShipmentProps["onChangeAddress"];
-    onChangeShipmentFormMode?: ConfigureShipmentProps["onChangeShipmentFormMode"];
-    onLabelCreateFailure?: ConfigureShipmentProps["onLabelCreateFailure"];
-    onLabelCreateSuccess?: ConfigureShipmentProps["onLabelCreateSuccess"];
-    onLoad?: UseConfigureShipmentProps["onLoad"];
-    onRateSaved?: ConfigureShipmentProps["onRateSaved"];
-    onRatesCalculated?: ConfigureShipmentProps["onRatesCalculated"];
-    onShipmentUpdated?: ConfigureShipmentProps["onShipmentUpdated"];
-    onToggleAddressPreferenceDisclosure?: ConfigureShipmentProps["onToggleAddressPreferenceDisclosure"];
     orderSourceCode?: UseImportSalesOrderProps["orderSourceCode"];
-    printLabelLayout?: ConfigureShipmentProps["printLabelLayout"];
     salesOrderId?: UseImportSalesOrderProps["salesOrderId"];
-    shippingPresets?: UseShippingPresetsOptionsProps;
-    warehouseId?: UseConfigureShipmentProps["warehouseId"];
 };
-export declare const PurchaseLabelBySalesOrder: ({ features, externalOrderId, externalOrderNumber, onLoad, onShipmentUpdated, orderSourceCode, salesOrderId, warehouseId, printLabelLayout, ...props }: SalesOrderProps) => import("@emotion/react/jsx-runtime").JSX.Element;
+export declare const PurchaseLabelBySalesOrder: ({ features, externalOrderId, externalOrderNumber, onLoad, onShipmentUpdated, orderSourceCode, salesOrderId, warehouseId, printLabelLayout, ...props }: PurchaseLabelSalesOrderProps) => import("@emotion/react/jsx-runtime").JSX.Element;

package/src/elements/purchase-label/purchase-label-by-shipment.d.ts

@@ -1,12 +1,5 @@
-import { ReactNode } from "react";
-import { SalesOrderProps } from "./purchase-label-by-sales-order";
-type ShipmentOrderProps = {
-    children?: ReactNode;
-} & ({
-    shipmentId: string;
-} | {
-    oneOff: true;
-});
-type PurchaseLabelByShipmentProps = Partial<SalesOrderProps> & ShipmentOrderProps;
-export declare const PurchaseLabelByShipment: ({ onLoad, onShipmentUpdated, features, ...props }: PurchaseLabelByShipmentProps) => import("@emotion/react/jsx-runtime").JSX.Element;
-export {};
+import { PurchaseLabelCommonProps } from "./purchase-label";
+export type PurchaseLabelByShipmentProps = PurchaseLabelCommonProps & {
+    shipmentId?: string;
+};
+export declare const PurchaseLabelByShipment: ({ onLoad, onShipmentUpdated, shipmentId, ...props }: PurchaseLabelByShipmentProps) => import("@emotion/react/jsx-runtime").JSX.Element;

package/src/elements/purchase-label/purchase-label.d.ts

@@ -1,17 +1,30 @@
-/// <reference types="react" />
-import { SalesOrderProps } from "./purchase-label-by-sales-order";
-type ComponentShipmentProps = SalesOrderProps & {
-    shipmentId: string;
+import React from "react";
+import { UseShippingPresetsOptionsProps } from "../../hooks";
+import { ConfigureShipmentProps } from "../configure-shipment";
+import { UseConfigureShipmentProps } from "./hooks";
+import { PurchaseLabelSalesOrderProps } from "./purchase-label-by-sales-order";
+import { PurchaseLabelByShipmentProps } from "./purchase-label-by-shipment";
+export type PurchaseLabelCommonProps = {
+    features?: ConfigureShipmentProps["features"];
+    onAddressValidation?: ConfigureShipmentProps["onAddressValidation"];
+    onApplyPreset?: ConfigureShipmentProps["onApplyPreset"];
+    onBeforeLabelCreate?: ConfigureShipmentProps["onBeforeLabelCreate"];
+    onChangeAddress?: ConfigureShipmentProps["onChangeAddress"];
+    onChangeShipmentFormMode?: ConfigureShipmentProps["onChangeShipmentFormMode"];
+    onLabelCreateFailure?: ConfigureShipmentProps["onLabelCreateFailure"];
+    onLabelCreateSuccess?: ConfigureShipmentProps["onLabelCreateSuccess"];
+    onLoad?: UseConfigureShipmentProps["onLoad"];
+    onRateSaved?: ConfigureShipmentProps["onRateSaved"];
+    onRatesCalculated?: ConfigureShipmentProps["onRatesCalculated"];
+    onShipmentUpdated?: ConfigureShipmentProps["onShipmentUpdated"];
+    onToggleAddressPreferenceDisclosure?: ConfigureShipmentProps["onToggleAddressPreferenceDisclosure"];
+    printLabelLayout?: ConfigureShipmentProps["printLabelLayout"];
+    shippingPresets?: UseShippingPresetsOptionsProps;
+    warehouseId?: UseConfigureShipmentProps["warehouseId"];
 };
-type ComponentOneOffProps = SalesOrderProps & {
-    oneOff: true;
-};
-type ComponentSalesOrderProps = SalesOrderProps & {
-    salesOrderId: string;
-};
-export type ComponentProps = ComponentShipmentProps | ComponentOneOffProps | ComponentSalesOrderProps;
-export declare const Component: ({ ...props }: ComponentProps) => import("@emotion/react/jsx-runtime").JSX.Element;
-export declare const Element: ({ resources, ...props }: ComponentProps & {
+type ElementProps = PurchaseLabelByShipmentProps | PurchaseLabelSalesOrderProps;
+export declare const Component: ({ ...props }: ElementProps) => import("@emotion/react/jsx-runtime").JSX.Element;
+export declare const Element: ({ resources, ...props }: ElementProps & {
     resources?: {
         en: {
             "wallet-history": {
@@ -606,5 +619,5 @@ export declare const Element: ({ resources, ...props }: ComponentProps & {
         };
     } | undefined;
 }) => import("@emotion/react/jsx-runtime").JSX.Element;
-export type ElementProps = React.ComponentProps<typeof Element>;
+export type ComponentProps = React.ComponentProps<typeof Element>;
 export {};

package/src/hooks/use-get-or-create-shipment.d.ts

@@ -1,2 +1,6 @@
-import { CodedError, SalesOrderShipment } from "@shipengine/alchemy";
-export declare const useGetOrCreateShipment: (shipmentId?: string) => import("react-query").UseQueryResult<SalesOrderShipment, CodedError[]>;
+export declare const useGetOrCreateShipment: (shipmentId?: string) => {
+    errors: import("@shipengine/alchemy").CodedError[] | undefined;
+    isLoading: boolean;
+    refetchShipment: <TPageData>(options?: (import("react-query").RefetchOptions & import("react-query").RefetchQueryFilters<TPageData>) | undefined) => Promise<import("react-query").QueryObserverResult<import("@shipengine/alchemy").SalesOrderShipment, import("@shipengine/alchemy").CodedError[]>>;
+    shipment: import("@shipengine/alchemy").SalesOrderShipment | undefined;
+};

package/src/utilities/shipengine/address.d.ts

@@ -23,3 +23,4 @@ export declare const isPoBox: (addressLine: string) => boolean;
  * @category Utilities
  */
 export declare const isPoBoxAddress: (address: SE.Address) => boolean;
+export declare const isEmptyAddress: (address?: SE.Address) => boolean;

package/src/utilities/shipengine/warehouses.d.ts

@@ -0,0 +1,2 @@
+import { SE } from "@shipengine/alchemy";
+export declare const getDefaultWarehouse: (warehouses: SE.Warehouse[]) => SE.Warehouse;

package/src/elements/purchase-label/hooks/use-load-or-create-shipment.d.ts

@@ -1,6 +0,0 @@
-export declare const useLoadOrCreateShipment: (shipmentId?: string) => {
-    errors: import("@shipengine/js-api").CodedError[] | undefined;
-    isLoading: boolean;
-    refetchShipment: <TPageData>(options?: (import("react-query").RefetchOptions & import("react-query").RefetchQueryFilters<TPageData>) | undefined) => Promise<import("react-query").QueryObserverResult<import("@shipengine/js-api").SalesOrderShipment, import("@shipengine/js-api").CodedError[]>>;
-    shipment: import("@shipengine/js-api").SalesOrderShipment | undefined;
-};