@shipengine/elements 2.24.1 → 2.25.0

package/dist/cjs/features/payment-method-settings/payment-method-settings.cjs

@@ -3,11 +3,14 @@
 var _tslib = require('../../_virtual/_tslib.cjs');
 var jsxRuntime = require('@emotion/react/jsx-runtime');
 var useToggle = require('../../hooks/use-toggle.cjs');
+var giger = require('@shipengine/giger');
 var reactApi = require('@shipengine/react-api');
 var React = require('react');
 var reactI18next = require('react-i18next');
 var editBillingForm = require('../../components/forms/edit-billing-form/edit-billing-form.cjs');
 var walletCard = require('../../components/wallet-card/wallet-card.cjs');
+var elementsContextProvider = require('../../elements-provider/elements-context-provider.cjs');
+var spacer = require('../../components/spacer/spacer.cjs');
 var loader = require('../../components/loader/loader.cjs');
 var zeroState = require('../../components/zero-state/zero-state.cjs');
 
@@ -18,37 +21,72 @@ const PaymentMethodSettings = ({
   const {
     t
   } = reactI18next.useTranslation();
+  const {
+    globalFeatures
+  } = elementsContextProvider.useElements();
+  const {
+    supportEmailAddress
+  } = globalFeatures;
   const [showEditBilling, toggleShowEditBilling] = useToggle.useToggle(false);
   const [isUpdatingBilling, setIsUpdatingBilling] = React.useState(false);
   const {
-    mutateAsync: updateBilling
+    error: updateBillingError,
+    mutateAsync: updateBilling,
+    reset: resetUpdateFundingSource
   } = reactApi.useUpdateFundingSource();
   const {
     data: fundingSources,
     refetch: refetchFundingSources,
     isLoading: fundingSourceLoading
   } = reactApi.useListFundingSources();
-  const fundingSourceId = (_a = fundingSources === null || fundingSources === void 0 ? void 0 : fundingSources[0]) === null || _a === void 0 ? void 0 : _a.fundingSourceId;
+  const {
+    fundingSourceId,
+    billingInfo
+  } = (_a = fundingSources === null || fundingSources === void 0 ? void 0 : fundingSources[0]) !== null && _a !== void 0 ? _a : {};
   const handleUpdateBilling = (billingInfo, creditCardInfo) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     if (fundingSourceId) {
-      setIsUpdatingBilling(true);
-      yield updateBilling({
-        billingInfo,
-        creditCardInfo,
-        fundingSourceId
-      });
-      yield refetchFundingSources();
-      toggleShowEditBilling(false);
-      setIsUpdatingBilling(false);
+      try {
+        setIsUpdatingBilling(true);
+        yield updateBilling({
+          billingInfo,
+          creditCardInfo,
+          fundingSourceId
+        });
+        yield refetchFundingSources();
+        toggleShowEditBilling(false);
+      } catch (error) {
+        console.error("Error updating billing:", error);
+        // error is handled by the mutation
+      } finally {
+        setIsUpdatingBilling(false);
+      }
     }
   });
-  if (showEditBilling) return jsxRuntime.jsx(editBillingForm.EditBillingForm, {
-    isLoading: isUpdatingBilling,
-    onCancel: () => {
-      toggleShowEditBilling(false);
-    },
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    onSubmit: handleUpdateBilling
+  if (showEditBilling) return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [jsxRuntime.jsx(editBillingForm.EditBillingForm, {
+      billingInfo: billingInfo,
+      isLoading: isUpdatingBilling,
+      onCancel: () => {
+        toggleShowEditBilling(false);
+        resetUpdateFundingSource();
+      },
+      onSubmit: (billingInfo, creditCardInfo) => {
+        void handleUpdateBilling(billingInfo, creditCardInfo);
+      }
+    }), (updateBillingError === null || updateBillingError === void 0 ? void 0 : updateBillingError.length) && jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [jsxRuntime.jsx(spacer.Spacer, {
+        multiplier: 2
+      }), jsxRuntime.jsx(giger.InlineNotification, {
+        css: {
+          textAlign: "left"
+        },
+        title: t("account-settings:errors.paymentMethod.title"),
+        type: giger.NotificationType.ERROR,
+        children: t("account-settings:errors.paymentMethod.description", {
+          email: supportEmailAddress
+        })
+      })]
+    })]
   });else {
     if (fundingSourceLoading) return jsxRuntime.jsx(loader.Loader, {
       message: t("loading.paymentMethod")

package/dist/cjs/hooks/use-configure-shipment.cjs

@@ -22,6 +22,8 @@ const useConfigureShipment = ({
   warehouseId,
   useWarehouses = true
 }) => {
+  // Track when we've created a replacement shipment for a "not found" case
+  const [replacementShipmentId, setReplacementShipmentId] = React.useState();
   // Queue of incomplete requirement keys (i.e., Ship From addresses, Warehouses, Carriers)
   const incompleteRequirementsKeys = React.useMemo(() => [], []);
   const {
@@ -77,7 +79,7 @@ const useConfigureShipment = ({
     salesOrderIds: salesOrderId ? [salesOrderId] : salesOrder$1 ? [salesOrder$1.salesOrderId] :
     // TODO: current workaround - revert to being undefined rather than empty list
     [],
-    shipmentIds: shipmentId ? [shipmentId] : externalShipment ? [externalShipment.shipmentId] : newV1Shipment ? [newV1Shipment.shipments[0].shipmentId] : undefined
+    shipmentIds: replacementShipmentId ? [replacementShipmentId] : shipmentId ? [shipmentId] : externalShipment ? [externalShipment.shipmentId] : newV1Shipment ? [newV1Shipment.shipments[0].shipmentId] : undefined
   });
   const {
     error: createSalesOrderShipmentErrors,
@@ -90,6 +92,19 @@ const useConfigureShipment = ({
   const cancelledShipment = shipment.getShipmentByStatus("cancelled", salesOrderShipments);
   const defaultWarehouse = warehouses.getDefaultWarehouse(warehouses$1);
   const defaultShipFromAddress = address.getDefaultShipFromAddress(shipFromAddresses);
+  // Common function to create a V1 shipment
+  const createV1ShipmentWithDefaults = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const v1Shipment = yield createV1Shipment(Object.assign({}, (defaultShipFromAddress === null || defaultShipFromAddress === void 0 ? void 0 : defaultShipFromAddress.originAddress) ? {
+      shipFrom: defaultShipFromAddress.originAddress
+    } : {
+      warehouseId: warehouseId ? warehouseId : defaultWarehouse.warehouseId
+    }));
+    if (v1Shipment) {
+      yield refetchSalesOrderShipments();
+      return v1Shipment;
+    }
+    return null;
+  }), [createV1Shipment, defaultShipFromAddress, defaultWarehouse, warehouseId, refetchSalesOrderShipments]);
   // Handles the creation of new shipments for the sales order flow and one-off flow
   const handleShipmentCreation = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
@@ -139,16 +154,17 @@ const useConfigureShipment = ({
     }
     // Create a Shipment for one-off flow
     if (!salesOrderId && !externalOrderId && !externalOrderNumber && !orderSourceCode && !shipmentId && !externalShipmentId) {
-      const v1Shipment = yield createV1Shipment(Object.assign({}, (defaultShipFromAddress === null || defaultShipFromAddress === void 0 ? void 0 : defaultShipFromAddress.originAddress) ? {
-        shipFrom: defaultShipFromAddress.originAddress
-      } : {
-        warehouseId: warehouseId ? warehouseId : defaultWarehouse.warehouseId
-      }));
-      if (v1Shipment) {
-        yield refetchSalesOrderShipments();
-      }
+      yield createV1ShipmentWithDefaults();
+    }
+  }), [createSalesOrderShipment, createV1ShipmentWithDefaults, creatingSalesOrderShipment, creatingV1Shipment, defaultShipFromAddress, defaultWarehouse, externalOrderId, externalOrderNumber, externalShipmentId, incompleteRequirementsKeys, isExternalShipmentFetching, isExternalShipmentInitialLoading, isFetchingWarehouses, isInitialLoadingWarehouses, labelPurchasedSalesOrderShipment, listSalesOrderShipmentsInitiallyLoading, listSalesOrderShipmentsIsFetching, orderSourceCode, pendingSalesOrderShipment, salesOrder$1, salesOrderId, salesOrderShipmentCreated, shipFromAddresses === null || shipFromAddresses === void 0 ? void 0 : shipFromAddresses.length, shipmentId, useWarehouses, v1shipmentCreated, warehouseId, warehouses$1]);
+  const createNewShipmentForNotFound = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // Force create a new shipment even if shipmentId exists (for shipment_not_found case)
+    const v1Shipment = yield createV1ShipmentWithDefaults();
+    if (v1Shipment) {
+      // Store the new shipment ID to override the stale one
+      setReplacementShipmentId(v1Shipment.shipments[0].shipmentId);
     }
-  }), [createSalesOrderShipment, createV1Shipment, creatingSalesOrderShipment, creatingV1Shipment, defaultShipFromAddress, defaultWarehouse, externalOrderId, externalOrderNumber, externalShipmentId, incompleteRequirementsKeys, isExternalShipmentFetching, isExternalShipmentInitialLoading, isFetchingWarehouses, isInitialLoadingWarehouses, labelPurchasedSalesOrderShipment, listSalesOrderShipmentsInitiallyLoading, listSalesOrderShipmentsIsFetching, orderSourceCode, pendingSalesOrderShipment, refetchSalesOrderShipments, salesOrder$1, salesOrderId, salesOrderShipmentCreated, shipFromAddresses === null || shipFromAddresses === void 0 ? void 0 : shipFromAddresses.length, shipmentId, useWarehouses, v1shipmentCreated, warehouseId, warehouses$1]);
+  }), [createV1ShipmentWithDefaults]);
   const refetchPendingSalesOrderShipments = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const {
       data: shipments
@@ -180,13 +196,18 @@ const useConfigureShipment = ({
     errorCode: "invalid_status",
     errorSource: "elements",
     errorType: "business_rules"
-  })] : []), ...(incompleteRequirementsKeys.length > 0 ? [new reactApi.CodedError(incompleteRequirementsKeys.length > 1 ? "no_carriers_and_warehouses" : incompleteRequirementsKeys[0], {
+  })] : []), ...(incompleteRequirementsKeys.length > 0 ? [new reactApi.CodedError(incompleteRequirementsKeys.length === 1 ? "no_carriers_and_warehouses" : incompleteRequirementsKeys[0], {
     errorCode: "unknown",
     errorSource: "elements",
     errorType: "business_rules"
+  })] : []), ...((salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) === 0 && shipmentId ? [new reactApi.CodedError("shipment_not_found", {
+    errorCode: "invalid_status",
+    errorSource: "elements",
+    errorType: "business_rules"
   })] : [])];
   return {
     carriers,
+    createNewShipmentForNotFound,
     errors: errors.length > 0 ? errors : undefined,
     isLoading: (isSalesOrderLoading || !(salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) || creatingSalesOrderShipment) && errors.length === 0,
     refetchPendingSalesOrderShipments,

package/dist/cjs/hooks/use-helpers.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var reactApi = require('@shipengine/react-api');
+var address = require('../utilities/address.cjs');
 var checks = require('../utilities/checks.cjs');
 
 const useHelpers = () => {
@@ -17,7 +18,9 @@ const useHelpers = () => {
   return {
     helpersReady,
     sellerOnboarded,
-    validateShipFromAddress: checks.validateShipFromAddress
+    validateShipFromAddress: checks.validateShipFromAddress,
+    getCountries: address.getCountries,
+    getUsStates: address.getUsStates
   };
 };
 

package/dist/cjs/index.cjs

@@ -4,7 +4,8 @@ var reactApi = require('@shipengine/react-api');
 var styles = require('./utilities/styles.cjs');
 var featureFlags = require('./utilities/feature-flags/feature-flags.cjs');
 var checks = require('./utilities/checks.cjs');
-var address = require('./constants/shipengine/address.cjs');
+var address = require('./utilities/address.cjs');
+var address$1 = require('./constants/shipengine/address.cjs');
 var manageCarriers = require('./elements/manage-carriers/manage-carriers.cjs');
 var manageWarehouses = require('./elements/manage-warehouses/manage-warehouses.cjs');
 var purchaseLabel = require('./elements/purchase-label/purchase-label.cjs');
@@ -46,17 +47,19 @@ exports.getDefaultFeatures = featureFlags.getDefaultFeatures;
 exports.getSellerIdFromToken = checks.getSellerIdFromToken;
 exports.isOnboarded = checks.isOnboarded;
 exports.validateShipFromAddress = checks.validateShipFromAddress;
-exports.Country = address.Country;
-exports.UsState = address.UsState;
-exports.UsaCity = address.UsaCity;
-exports.addressNameRegex = address.addressNameRegex;
-exports.countries = address.countries;
-exports.countryCodes = address.countryCodes;
-exports.euCountryCodes = address.euCountryCodes;
-exports.postalCodeRegex = address.postalCodeRegex;
-exports.usCities = address.usCities;
-exports.usStateCodes = address.usStateCodes;
-exports.usStates = address.usStates;
+exports.getCountries = address.getCountries;
+exports.getUsStates = address.getUsStates;
+exports.Country = address$1.Country;
+exports.UsState = address$1.UsState;
+exports.UsaCity = address$1.UsaCity;
+exports.addressNameRegex = address$1.addressNameRegex;
+exports.countries = address$1.countries;
+exports.countryCodes = address$1.countryCodes;
+exports.euCountryCodes = address$1.euCountryCodes;
+exports.postalCodeRegex = address$1.postalCodeRegex;
+exports.usCities = address$1.usCities;
+exports.usStateCodes = address$1.usStateCodes;
+exports.usStates = address$1.usStates;
 exports.ManageCarriers = manageCarriers;
 exports.ManageWarehouses = manageWarehouses;
 exports.PurchaseLabel = purchaseLabel;

package/dist/cjs/locales/en/account-settings.json.cjs

@@ -26,6 +26,12 @@ var accoutSettings = {
 		labelLayout: "Shipping Label Layout",
 		unitSettings: "Units of Measure",
 		vatSettings: "Tax Settings"
+	},
+	errors: {
+		paymentMethod: {
+			title: "Error Updating Payment Method",
+			description: "There was an error updating your payment method. Ensure your payment information is correct and try again. If the problem persists, contact support at {{email}}."
+		}
 	}
 }
 };

package/dist/cjs/locales/en/common.json.cjs

@@ -165,10 +165,12 @@ var common = {
 		total: "Total"
 	},
 	errorMessages: {
+		fundingSourceCreationFailed: "Please check your payment and billing details, and confirm that your bank hasn’t blocked the payment method. If the issue persists, please contact support at {{email}}.",
 		contactSupport: "Your transaction may not have processed as expected. Please contact support at {{email}}.",
 		invalidNameOrCompany: "Recipient name and company name (if provided) must have two characters in first and last name.",
 		parsingFailure: "Parsing failed. Please check address and try again.",
 		incompleteLabelPurchaseRequirements: "Please add your {{requirements}} to continue purchasing a label.",
+		shipmentNotFound: "Cannot find shipment with ID: {{id}}.",
 		shipmentCancelled: "This shipment is Cancelled in ShipStation. Log into ShipStation to restore the order to Awaiting Shipment status.",
 		unableToLoad: {
 			accountSettings: "Unable to load account settings",

package/dist/cjs/locales/en/purchase-label.json.cjs

@@ -12,7 +12,8 @@ var purchaseLabel = {
 		showItems: "Show items",
 		showMoreRates: "Show more rates",
 		showFewerRates: "Show fewer rates",
-		saveRate: "Save Rate"
+		saveRate: "Save Rate",
+		createNewShipment: "Create New Shipment"
 	},
 	balance: {
 		currentBalance: "Available Funds:",
@@ -129,7 +130,6 @@ var purchaseLabel = {
 		otherLocations: "Other drop off points near you:",
 		noServicePointsForService: "There are no drop off locations for this service within 10km of your search area.",
 		error: "Unable to find drop off locations within 10km of your search area.",
-		paperless: "Print & Paperless",
 		localTimeDisclaimer: "Hours shown in local time"
 	},
 	shipToAddressFormFields: "Ship To Address Form Fields",
@@ -143,7 +143,9 @@ var purchaseLabel = {
 	},
 	warnings: {
 		parcelGuardShipDate: "ParcelGuard must be purchased within 48 hours of the ship date. Please update the ship date to continue."
-	}
+	},
+	paperlessAvailable: "Paperless available",
+	usePaperlessLabel: "Use Paperless Label (QR Code)"
 }
 };
 

package/dist/cjs/package.json.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-var version = "2.24.1";
+var version = "2.25.0";
 
 exports.version = version;

package/dist/cjs/utilities/address.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+var address = require('../constants/shipengine/address.cjs');
+
+/**
+ * Returns a simplified list of countries for use in dropdowns and forms.
+ *
+ * @returns Array of country objects with name and code properties
+ */
+const getCountries = () => {
+  return address.countries.map(country => ({
+    name: country.name,
+    code: country.code
+  }));
+};
+/**
+ * Returns a simplified list of US states for use in dropdowns and forms.
+ *
+ * @returns Array of US state objects with name and code properties
+ */
+const getUsStates = () => {
+  return address.usStates.map(state => ({
+    name: state.name,
+    code: state.code
+  }));
+};
+
+exports.getCountries = getCountries;
+exports.getUsStates = getUsStates;

package/dist/cjs/utilities/index.cjs

@@ -2,6 +2,7 @@
 
 var styles = require('./styles.cjs');
 var checks = require('./checks.cjs');
+var address = require('./address.cjs');
 var featureFlags = require('./feature-flags/feature-flags.cjs');
 
 
@@ -11,4 +12,6 @@ exports.scopeTheme = styles.scopeTheme;
 exports.getSellerIdFromToken = checks.getSellerIdFromToken;
 exports.isOnboarded = checks.isOnboarded;
 exports.validateShipFromAddress = checks.validateShipFromAddress;
+exports.getCountries = address.getCountries;
+exports.getUsStates = address.getUsStates;
 exports.getDefaultFeatures = featureFlags.getDefaultFeatures;

package/dist/cjs/utilities/money.cjs

@@ -38,6 +38,19 @@ const calculateTotal = (...values) => {
     return value ? total + ((_a = value.amount) !== null && _a !== void 0 ? _a : 0) : total;
   }, 0);
 };
+/**
+ * @internal
+ *
+ * # Money Utils - maskCreditCardNumber
+ */
+const maskCreditCardNumber = cc => {
+  const sanitizedCC = cc.replace(/\s/g, "");
+  if (!sanitizedCC || sanitizedCC.length < 15 || sanitizedCC.length > 16) {
+    return cc;
+  }
+  const maskedCCNumber = "*".repeat(sanitizedCC.length - 4) + sanitizedCC.slice(-4);
+  return maskedCCNumber.replace(/(.{4})/g, "$1 ").trim();
+};
 /**
  * @internal
  *
@@ -103,3 +116,4 @@ exports.formatExpiration = formatExpiration;
 exports.formatMoney = formatMoney;
 exports.getCurrencyFromString = getCurrencyFromString;
 exports.getCurrencySymbolFromString = getCurrencySymbolFromString;
+exports.maskCreditCardNumber = maskCreditCardNumber;

package/dist/cjs/utilities/rate-warning-messages.cjs

@@ -0,0 +1,25 @@
+'use strict';
+
+var rateMessages = require('../data/rate-messages.json.cjs');
+
+/**
+ * Builds warning messages for a rate by combining messages from different sources:
+ * 1. Messages for serviceCode:shipDay combination
+ * 2. Messages for serviceCode:packageType combination
+ * 3. Messages for serviceCode only
+ * 4. Existing warning messages from the rate
+ */
+const buildRateWarningMessages = ({
+  serviceCode,
+  packageType,
+  shipDay,
+  existingWarningMessages = []
+}) => {
+  const keys = [shipDay && `${serviceCode}:${shipDay}`, packageType && `${serviceCode}:${packageType}`, serviceCode].filter(Boolean);
+  return [...keys.flatMap(key => {
+    var _a;
+    return (_a = rateMessages.default[key]) !== null && _a !== void 0 ? _a : [];
+  }), ...existingWarningMessages];
+};
+
+exports.buildRateWarningMessages = buildRateWarningMessages;

package/dist/cjs/utilities/shipengine/warehouses.cjs

@@ -1,7 +1,8 @@
 'use strict';
 
 const getDefaultWarehouse = warehouses => {
-  return warehouses === null || warehouses === void 0 ? void 0 : warehouses.find(w => w.isDefault);
+  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 getWarehouseById = (warehouseId, warehouses) => {
   return warehouses === null || warehouses === void 0 ? void 0 : warehouses.find(w => w.warehouseId === warehouseId);

package/dist/cjs/workflows/connect-external-carrier/connect-external-carrier.cjs

@@ -85,7 +85,7 @@ const Component = ({
     refetch: refetchSchema
   } = reactApi.useGetCarrierConnectionForm({
     carrierName: selectedCarrier !== null && selectedCarrier !== void 0 ? selectedCarrier : "apicode-dummy-carrier",
-    enabled: false
+    enabled: !!selectedCarrier
   });
   React.useEffect(() => {
     if (selectedCarrier && needsRefetch) {
@@ -152,7 +152,9 @@ const Component = ({
       const updatedSchema = Object.assign({}, schema);
       // camelize required fields, as casing varies between carriers
       if (updatedSchema.required && Array.isArray(updatedSchema.required)) {
-        updatedSchema.required = updatedSchema.required.map(humps__namespace.camelize);
+        updatedSchema.required = updatedSchema.required.map(item => {
+          return typeof item === "string" ? humps__namespace.camelize(item) : item;
+        });
       }
       // camelize property keys
       // fail safe to ensure schema properties and required array match in the event the camelizeKeys from shipengine/js-api isn't consistent
@@ -174,7 +176,9 @@ const Component = ({
     const updatedUiSchema = Object.assign({}, uiSchemaClone);
     // add nickname to ui:order and camelize the values to ensure consistency with jsonSchema properties and required array
     if (!hasNicknameProperty && updatedUiSchema["ui:order"]) {
-      updatedUiSchema["ui:order"] = [...updatedUiSchema["ui:order"], "nickname"].map(humps__namespace.camelize);
+      // ui:order is typically an array of strings, but apparently can also be an array of arrays of strings, so we need to recursively camelize the items
+      const camelizeUIOrderItem = item => typeof item === "string" ? humps__namespace.camelize(item) : item.map(i => humps__namespace.camelize(i));
+      updatedUiSchema["ui:order"] = [...updatedUiSchema["ui:order"], "nickname"].map(camelizeUIOrderItem);
     }
     return updatedUiSchema;
   }, [uiSchema, hasNicknameProperty]);

package/dist/cjs/workflows/label-workflow/label-workflow.cjs

@@ -46,6 +46,7 @@ const Component = _a => {
     data: accountSettings
   } = reactApi.useGetAccountSettings();
   const {
+    createNewShipmentForNotFound,
     shipment: shipment$1,
     salesOrder,
     isLoading: isConfiguringShipment,
@@ -59,19 +60,24 @@ const Component = _a => {
     useWarehouses: (_b = propFeatures === null || propFeatures === void 0 ? void 0 : propFeatures.shipmentForm) === null || _b === void 0 ? void 0 : _b.useWarehouses,
     warehouseId
   }));
+  // Track if we have a shipment_not_found error to avoid reusing the bad shipment ID
+  const hasShipmentNotFoundError = configureShipmentErrors === null || configureShipmentErrors === void 0 ? void 0 : configureShipmentErrors.some(error => error.message === "shipment_not_found");
+  const shipmentId = _multiplexedId && "shipmentId" in _multiplexedId ? _multiplexedId.shipmentId : undefined;
   const {
     data: insuranceAccount,
     isInitialLoading: insuranceIsLoading
   } = reactApi.useGetInsuranceAccount((shipment$1 === null || shipment$1 === void 0 ? void 0 : shipment$1.insuranceProvider) === reactApi.SE.InsuranceProviderType.SHIPSURANCE ? reactApi.SE.InsuranceProviderType.SHIPSURANCE : undefined);
   const {
     data: labelsResponse,
-    isLoading: isLabelsLoading,
+    isFetching: isLabelsLoading,
     error: listLabelsErrors,
     refetch: refetchLabels
   } = reactApi.useListLabels({
-    enabled: _multiplexedId && "shipmentId" in _multiplexedId ? true : !!(shipment$1 === null || shipment$1 === void 0 ? void 0 : shipment$1.shipmentId),
+    enabled:
+    // Don't enable if we have a shipment_not_found error (avoid reusing bad ID)
+    hasShipmentNotFoundError ? false : _multiplexedId && "shipmentId" in _multiplexedId ? true : !!(shipment$1 === null || shipment$1 === void 0 ? void 0 : shipment$1.shipmentId),
     queryFnParams: {
-      shipmentId: _multiplexedId && "shipmentId" in _multiplexedId ? _multiplexedId.shipmentId : shipment$1 === null || shipment$1 === void 0 ? void 0 : shipment$1.shipmentId
+      shipmentId: (shipment$1 === null || shipment$1 === void 0 ? void 0 : shipment$1.shipmentId) || (!hasShipmentNotFoundError ? shipmentId : undefined)
     }
   });
   /**
@@ -175,6 +181,8 @@ const Component = _a => {
     data: shipment$1 || salesOrder,
     errors: errors.length ? errors : undefined,
     isLoading: isLabelsLoading || isConfiguringShipment || insuranceIsLoading,
+    onCreateNewShipment: createNewShipmentForNotFound,
+    shipmentId: shipmentId,
     children: element && getElement(element)
   });
 };

package/dist/cjs/workflows/onboarding/components/confirmation-and-submission-step/confirmation-and-submission-step.cjs

@@ -73,7 +73,7 @@ const ConfirmationAndSubmissionStep = ({
       }),
       children: [jsxRuntime.jsx(ccProviderLogo.CcProviderLogo, {
         provider: provider,
-        width: 36
+        width: 56
       }), jsxRuntime.jsx(giger.Typography, {
         variant: "body2",
         children: `**** **** **** ${last4 !== null && last4 !== void 0 ? last4 : "****"}`

package/dist/cjs/workflows/onboarding/components/confirmation-and-submission-step/use-confirmation-and-submission-step.cjs

@@ -1,10 +1,12 @@
 'use strict';
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
+var useScrubErrors = require('../../../../hooks/use-scrub-errors.cjs');
 var reactApi = require('@shipengine/react-api');
 var checks = require('../../../../utilities/checks.cjs');
 var warehouses = require('../../../../utilities/shipengine/warehouses.cjs');
 var React = require('react');
+var reactI18next = require('react-i18next');
 var useManageWarehouses = require('../../../../features/manage-warehouses/use-manage-warehouses.cjs');
 var elementsContextProvider = require('../../../../elements-provider/elements-context-provider.cjs');
 
@@ -15,6 +17,9 @@ const useConfirmationAndSubmissionStep = ({
     globalFeatures,
     getToken
   } = elementsContextProvider.useElements();
+  const {
+    t
+  } = reactI18next.useTranslation();
   const [isSubmittingOnboarding, setIsSubmittingOnboarding] = React.useState(false);
   const {
     createWarehouse,
@@ -35,6 +40,15 @@ const useConfirmationAndSubmissionStep = ({
     mutateAsync: createFundingSource,
     reset: resetCreateFundingSource
   } = reactApi.useCreateFundingSource();
+  const displayableCreateFundingSourceErrors = useScrubErrors.useScrubErrors({
+    errors: createFundingSourceErrors !== null && createFundingSourceErrors !== void 0 ? createFundingSourceErrors : undefined,
+    predicate: React.useCallback(e => e.message.includes("An unexpected error occurred."), []),
+    scrubber: React.useCallback(() => {
+      return `${t("common:errorMessages.fundingSourceCreationFailed", {
+        email: globalFeatures.supportEmailAddress
+      })} `;
+    }, [globalFeatures.supportEmailAddress, t])
+  });
   const {
     error: updatePaymentMethodErrors,
     isLoading: isUpdatingPaymentMethod,
@@ -296,7 +310,9 @@ const useConfirmationAndSubmissionStep = ({
     setIsSubmittingOnboarding(false);
   }), [onboardSeller, updateExistingFundingSource, onStepComplete, createFundingSourceErrors, registerCarrierErrors, updatePaymentMethodErrors, updateWarehouseErrors]);
   return {
-    createFundingSourceErrors,
+    createFundingSourceErrors: displayableCreateFundingSourceErrors === null || displayableCreateFundingSourceErrors === void 0 ? void 0 : displayableCreateFundingSourceErrors.map(message => ({
+      message
+    })),
     createOnboardingSubmissionHandler,
     isLoading: {
       connectingCarriers: isRegisteringCarriers,

package/dist/cjs/workflows/onboarding/components/onboarding-wizard/onboarding-wizard.cjs

@@ -61,6 +61,7 @@ const OnboardingWizard = ({
     isLoadingTermsAgreementStep,
     fundingSourceRequiredTerms,
     fundingSourceMetadata,
+    hasFreeStampsConnected,
     handleSubmitTermsAgreement,
     refetchCarriers,
     refetchFundingSources,
@@ -167,8 +168,10 @@ const OnboardingWizard = ({
       return jsxRuntime.jsx(termsAgreementStep.TermsAgreementStep, {
         carrierProfilesToRegister: carrierProfilesToRegister,
         enabledCarrierProfiles: enabledCarrierProfiles,
+        fundingSourceRequiredTerms: fundingSourceRequiredTerms,
         insuranceProviderProfiles: insuranceProviderProfiles,
-        onSubmit: handleSubmitTermsAgreement
+        onSubmit: handleSubmitTermsAgreement,
+        showStampsLogo: hasFreeStampsConnected
       });
     },
     label: t("onboarding:stepLabel.termsAgreement")

package/dist/cjs/workflows/onboarding/components/terms-agreement-form/terms-agreement-form.cjs

@@ -20,6 +20,7 @@ var submitButton = require('../../../../components/field/submit-button/submit-bu
 const TermsAgreementForm = ({
   carrierTerms,
   hideTerms,
+  requiredTerms = [],
   insuranceProviderTerms,
   isSubmitDisabled,
   onSubmit
@@ -98,7 +99,9 @@ const TermsAgreementForm = ({
               title: t("onboarding:termsAndAgreementLinkText.auctanePrivacyPolicy")
             }]
           }
-        }), !!carrierTerms.length && jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        }), requiredTerms.map(term => jsxRuntime.jsx(displayTerm.DisplayTerm, {
+          term: term
+        }, term.termType)), !!carrierTerms.length && jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [jsxRuntime.jsx(spacer.Spacer, {}), jsxRuntime.jsx(giger.Typography, {
             bold: true,
             variant: "body1",

package/dist/cjs/workflows/onboarding/components/terms-agreement-step/terms-agreement-step.cjs

@@ -16,7 +16,9 @@ const TermsAgreementStep = ({
   carrierProfilesToRegister,
   insuranceProviderProfiles,
   onSubmit,
-  enabledCarrierProfiles
+  enabledCarrierProfiles,
+  fundingSourceRequiredTerms,
+  showStampsLogo = false
 }) => {
   var _a, _b, _c, _d, _e;
   const {
@@ -49,8 +51,16 @@ const TermsAgreementStep = ({
     });
   }
   const renderCarrierLogos = () => {
+    var _a;
     if (!carrierProfilesToRegister.length) return null;
-    return carrierProfilesToRegister.map(p => {
+    const stampsCarrierProfile = {
+      carrierCode: "stamps_com",
+      carrierName: (_a = carrierFriendlyNames["stamps_com"]) === null || _a === void 0 ? void 0 : _a.name
+    };
+    // kind of a goofy way to just display stamps/usps logo without sending it in the payload to register
+    // we don't want to register stamps as a carrier if it's not being used as the primary payment method
+    const carriersToDisplay = showStampsLogo ? [stampsCarrierProfile, ...carrierProfilesToRegister] : carrierProfilesToRegister;
+    return carriersToDisplay.map(p => {
       var _a;
       return jsxRuntime.jsx(carrierLogo.CarrierLogo, {
         carrierCode: p.carrierCode,
@@ -101,7 +111,8 @@ const TermsAgreementStep = ({
         carrierTerms: carrierTerms,
         hideTerms: hideTerms,
         insuranceProviderTerms: insuranceProviderTerms,
-        onSubmit: onSubmit
+        onSubmit: onSubmit,
+        requiredTerms: fundingSourceRequiredTerms
       })
     })]
   });