@shipengine/elements 2.26.2 → 2.26.4

package/dist/cjs/components/cc-provider-logo/cc-provider-logo.cjs

@@ -14,7 +14,7 @@ const CcProviderLogo = ({
   height = 36
 }) => {
   const providerLogos = {
-    americanExpress: amex,
+    american_express: amex,
     discover,
     mastercard,
     visa
@@ -25,6 +25,7 @@ const CcProviderLogo = ({
       size: giger.IconSize.SIZE_LARGE
     });
   }
+  // TODO: LMNT-1810 - Add missing provider logos
   const Logo = providerLogos[provider];
   return jsxRuntime.jsx(Logo, {
     height: height,

package/dist/cjs/components/forms/wallet-form/wallet-schema.cjs

@@ -77,7 +77,7 @@ const creditCardSchema = zod.z.object({
     expirationMonth: expirationMonth,
     expirationYear: expirationYear,
     name: creditCard.name,
-    provider: creditCardVendor === "american-express" ? "americanExpress" : creditCardVendor
+    provider: creditCardVendor === "american-express" ? "american_express" : creditCardVendor
   };
 });
 const getWalletSchema = (emailRequirement, blackboxRequirement) => {

package/dist/cjs/components/shipment-not-found-error/shipment-not-found-error.cjs

@@ -7,12 +7,26 @@ var reactI18next = require('react-i18next');
 var shipmentNotFoundError_styles = require('./shipment-not-found-error.styles.cjs');
 
 const ShipmentNotFoundError = ({
-  shipmentId,
+  identifier,
   onCreateNewShipment
 }) => {
   const {
     t
   } = reactI18next.useTranslation(["common", "purchase-label"]);
+  const getIdentifierInfo = identifier => {
+    // Order should match the actual search priority in useConfigureShipment:
+    const identifierKeys = ["shipmentId", "externalShipmentId", "salesOrderId", "externalOrderId", "externalOrderNumber"];
+    const foundKey = identifierKeys.find(key => identifier === null || identifier === void 0 ? void 0 : identifier[key]);
+    const identifierKey = foundKey || "shipmentId";
+    return {
+      type: t(`purchase-label:identifierTypes.${identifierKey}`),
+      value: identifier === null || identifier === void 0 ? void 0 : identifier[identifierKey]
+    };
+  };
+  const {
+    type: identifierType,
+    value: identifierNumber
+  } = getIdentifierInfo(identifier);
   return jsxRuntime.jsxs("div", {
     css: shipmentNotFoundError_styles.styles.container,
     children: [jsxRuntime.jsx("div", {
@@ -24,7 +38,8 @@ const ShipmentNotFoundError = ({
     }), jsxRuntime.jsx("div", {
       css: shipmentNotFoundError_styles.styles.message,
       children: t("common:errorMessages.shipmentNotFound", {
-        id: shipmentId
+        identifierType,
+        identifierNumber
       })
     }), jsxRuntime.jsx(giger.Button, {
       "data-testid": "create-new-shipment",

package/dist/cjs/components/suspend-purchase/suspend-purchase.cjs

@@ -11,7 +11,7 @@ const SuspendPurchase = ({
   isLoading,
   data,
   onCreateNewShipment,
-  shipmentId
+  identifier
 }) => {
   const {
     t
@@ -38,8 +38,8 @@ const SuspendPurchase = ({
           throw new Error(t("common:errorMessages.labelHasBeenPurchased"));
         case "shipment_not_found":
           return jsxRuntime.jsx(shipmentNotFoundError.ShipmentNotFoundError, {
-            onCreateNewShipment: onCreateNewShipment,
-            shipmentId: shipmentId
+            identifier: identifier,
+            onCreateNewShipment: onCreateNewShipment
           });
       }
     }

package/dist/cjs/elements/purchase-label/hooks/use-address.cjs

@@ -162,7 +162,7 @@ const useAddress = ({
       if (warning && warning.error) return warning;
       const value = addressMinusGeolocation[key];
       if (!value) return warning;
-      if (/^[0-9\p{Script=Latin}\p{P}\p{S}\s]+$/u.test(value)) return warning;
+      if (/^[0-9A-Za-z\u00C0-\u017F\u0100-\u024F\u1E00-\u1EFF\u0020-\u002F\u003A-\u0040\u005B-\u0060\u007B-\u007E\u00A0-\u00BF\u2000-\u206F\u2E00-\u2E7F\s]+$/u.test(value)) return warning;
       if (key === "name" || key === "companyName") {
         return {
           error: false,

package/dist/cjs/elements/purchase-label/purchase-label.cjs

@@ -92,9 +92,15 @@ const Component = _a => {
   return jsxRuntime.jsx(suspendPurchase.SuspendPurchase, {
     data: shipment || salesOrder,
     errors: errors,
+    identifier: {
+      externalOrderId,
+      externalOrderNumber,
+      externalShipmentId,
+      salesOrderId,
+      shipmentId
+    },
     isLoading: isLoading || insuranceIsLoading,
     onCreateNewShipment: createNewShipmentForNotFound,
-    shipmentId: shipmentId,
     children: jsxRuntime.jsx(configureShipment.ConfigureShipment, Object.assign({
       currency: currency,
       features: features,

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

@@ -22,8 +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();
+  // Track when user manually created a shipment for a "not found" case
+  const [manuallyCreatedShipmentId, setManuallyCreatedShipmentId] = React.useState();
   // Queue of incomplete requirement keys (i.e., Ship From addresses, Warehouses, Carriers)
   const incompleteRequirementsKeys = React.useMemo(() => [], []);
   const {
@@ -47,6 +47,7 @@ const useConfigureShipment = ({
     // Dont run Sales Order Import unless the Sales order info is present
     enabled: !!externalOrderNumber || !!orderSourceCode || !!salesOrderId || !!externalOrderId,
     externalOrderId,
+    externalOrderNumber,
     orderSourceCode,
     salesOrderId
   });
@@ -63,24 +64,49 @@ const useConfigureShipment = ({
     isInitialLoading: isExternalShipmentInitialLoading,
     isFetching: isExternalShipmentFetching
   } = reactApi.useGetShipmentByExternalId({
-    enabled: !!externalShipmentId && !shipmentId,
+    enabled: !!externalShipmentId && !shipmentId && !manuallyCreatedShipmentId,
     queryFnParams: {
       externalId: externalShipmentId !== null && externalShipmentId !== void 0 ? externalShipmentId : ""
     }
+    // TODO: weird refetch on focus behavior
   });
+  // #region List Sales Order Shipments
+  const externalOrderIds = React.useMemo(() => {
+    return externalOrderId ? [externalOrderId] : undefined;
+  }, [externalOrderId]);
+  const salesOrderIds = React.useMemo(() => {
+    return salesOrderId ? [salesOrderId] : salesOrder$1 ? [salesOrder$1.salesOrderId] :
+    // TODO: current workaround - revert to being undefined rather than empty list
+    [];
+  }, [salesOrderId, salesOrder$1]);
+  const shipmentIds = React.useMemo(() => {
+    return manuallyCreatedShipmentId ? [manuallyCreatedShipmentId] : shipmentId ? [shipmentId] : externalShipment ? [externalShipment.shipmentId] : newV1Shipment ? [newV1Shipment.shipments[0].shipmentId] : undefined;
+  }, [manuallyCreatedShipmentId, shipmentId, externalShipment, newV1Shipment]);
+  const listSalesOrderShipmentsParams = React.useMemo(() => {
+    // TODO: useListSalesOrderShipments needs to be able to use the enabled prop, this is a workaround
+    // Prevent query with stale params during shipment creation or when V1 shipment exists but manuallyCreatedShipmentId not set
+    if (creatingV1Shipment && !manuallyCreatedShipmentId || newV1Shipment && !manuallyCreatedShipmentId) {
+      return {};
+    }
+    if (manuallyCreatedShipmentId) {
+      return {
+        shipmentIds
+      };
+    }
+    return {
+      externalOrderIds,
+      salesOrderIds,
+      shipmentIds
+    };
+  }, [manuallyCreatedShipmentId, externalOrderIds, salesOrderIds, shipmentIds, creatingV1Shipment, newV1Shipment]);
   const {
     data: salesOrderShipments,
     error: listSalesOrderShipmentsErrors,
     refetch: refetchSalesOrderShipments,
     isInitialLoading: listSalesOrderShipmentsInitiallyLoading,
     isFetching: listSalesOrderShipmentsIsFetching
-  } = reactApi.useListSalesOrderShipments({
-    externalOrderIds: externalOrderId ? [externalOrderId] : undefined,
-    salesOrderIds: salesOrderId ? [salesOrderId] : salesOrder$1 ? [salesOrder$1.salesOrderId] :
-    // TODO: current workaround - revert to being undefined rather than empty list
-    [],
-    shipmentIds: replacementShipmentId ? [replacementShipmentId] : shipmentId ? [shipmentId] : externalShipment ? [externalShipment.shipmentId] : newV1Shipment ? [newV1Shipment.shipments[0].shipmentId] : undefined
-  });
+  } = reactApi.useListSalesOrderShipments(listSalesOrderShipmentsParams);
+  // #endregion
   const {
     error: createSalesOrderShipmentErrors,
     mutateAsync: createSalesOrderShipment,
@@ -105,6 +131,7 @@ const useConfigureShipment = ({
     }
     return null;
   }), [createV1Shipment, defaultShipFromAddress, defaultWarehouse, warehouseId, refetchSalesOrderShipments]);
+  // #region Create Sales Order Shipment
   // 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;
@@ -154,17 +181,23 @@ const useConfigureShipment = ({
     }
     // Create a Shipment for one-off flow
     if (!salesOrderId && !externalOrderId && !externalOrderNumber && !orderSourceCode && !shipmentId && !externalShipmentId) {
-      yield createV1ShipmentWithDefaults();
+      const v1Shipment = yield createV1ShipmentWithDefaults();
+      // Set manuallyCreatedShipmentId to ensure proper query parameter handling
+      if (v1Shipment) {
+        setManuallyCreatedShipmentId(v1Shipment.shipments[0].shipmentId);
+      }
     }
   }), [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]);
+  // #endregion
   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);
+      setManuallyCreatedShipmentId(v1Shipment.shipments[0].shipmentId);
+      // Refetch to ensure we have the latest shipment data
+      yield refetchSalesOrderShipments();
     }
-  }), [createV1ShipmentWithDefaults]);
+  }), [createV1ShipmentWithDefaults, refetchSalesOrderShipments]);
   const refetchPendingSalesOrderShipments = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const {
       data: shipments
@@ -188,7 +221,83 @@ const useConfigureShipment = ({
     if (isInitialLoadingCarriers || isFetchingCarriers) return;
     if ((carriers === null || carriers === void 0 ? void 0 : carriers.length) === 0) incompleteRequirementsKeys.push("no_carriers");
   }, [carriers, incompleteRequirementsKeys, isFetchingCarriers, isInitialLoadingCarriers]);
-  const errors = [...(listWarehouseErrors !== null && listWarehouseErrors !== void 0 ? listWarehouseErrors : []), ...(createSalesOrderShipmentErrors !== null && createSalesOrderShipmentErrors !== void 0 ? createSalesOrderShipmentErrors : []), ...(createV1ShipmentErrors !== null && createV1ShipmentErrors !== void 0 ? createV1ShipmentErrors : []), ...(listSalesOrderShipmentsErrors !== null && listSalesOrderShipmentsErrors !== void 0 ? listSalesOrderShipmentsErrors : []), ...(getExternalShipmentErrors !== null && getExternalShipmentErrors !== void 0 ? getExternalShipmentErrors : []), ...(importSalesOrderErrors !== null && importSalesOrderErrors !== void 0 ? importSalesOrderErrors : []), ...(errorWhenShipmentCancelled && cancelledShipment ? [new reactApi.CodedError("shipment_cancelled", {
+  const isConfigureShipmentLoading = React.useMemo(() => {
+    if (isSalesOrderLoading) return true;
+    if (listSalesOrderShipmentsInitiallyLoading) return true;
+    if (listSalesOrderShipmentsIsFetching) return true;
+    if (creatingSalesOrderShipment) return true;
+    if (creatingV1Shipment) return true;
+    // Include external shipment loading states to prevent premature error display
+    // Only keep loading if we're actually fetching and don't have an error yet
+    // Skip this check if we already have an error to avoid infinite loading
+    if (externalShipmentId && isExternalShipmentFetching && !getExternalShipmentErrors && !isExternalShipmentInitialLoading) {
+      return true;
+    }
+    // Check if this is a one-off flow (no identifiers provided)
+    const isOneOffFlow = !salesOrderId && !externalOrderId && !externalOrderNumber && !orderSourceCode && !shipmentId && !externalShipmentId;
+    // For one-off flow, keep loading until we have shipment data or V1 creation is complete
+    if (isOneOffFlow && !pendingSalesOrderShipment && !labelPurchasedSalesOrderShipment) {
+      return true;
+    }
+    // Only consider empty salesOrderShipments array as loading if we're not initially loading and have valid identifiers
+    const shouldReturnTrueForEmptyShipments = (salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) === 0 && !listSalesOrderShipmentsInitiallyLoading && !listSalesOrderShipmentsIsFetching;
+    if (shouldReturnTrueForEmptyShipments) {
+      return true;
+    }
+    return false;
+  }, [isSalesOrderLoading, listSalesOrderShipmentsInitiallyLoading, listSalesOrderShipmentsIsFetching, creatingSalesOrderShipment, creatingV1Shipment, isExternalShipmentInitialLoading, isExternalShipmentFetching, getExternalShipmentErrors,
+  // This was missing!
+  salesOrderId, externalOrderId, externalOrderNumber, orderSourceCode, shipmentId, externalShipmentId, pendingSalesOrderShipment, labelPurchasedSalesOrderShipment, salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length]);
+  // #region Custom Error Mapping
+  const hasGetShipmentErrors = React.useMemo(() => {
+    // Check for explicit API errors
+    if (listSalesOrderShipmentsErrors) return true;
+    if (getExternalShipmentErrors) return true;
+    if (importSalesOrderErrors) return true;
+    // Only treat empty results as error if we're not loading and have finished initial fetch
+    if ((salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) === 0 && shipmentId && !listSalesOrderShipmentsInitiallyLoading && !listSalesOrderShipmentsIsFetching) {
+      return true;
+    }
+    return false;
+  }, [listSalesOrderShipmentsErrors, getExternalShipmentErrors, importSalesOrderErrors, salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length, shipmentId, listSalesOrderShipmentsInitiallyLoading, listSalesOrderShipmentsIsFetching]);
+  const hasValidShipmentData = React.useMemo(() => {
+    if (manuallyCreatedShipmentId) return true;
+    if (pendingSalesOrderShipment) return true;
+    if (labelPurchasedSalesOrderShipment) return true;
+    return false;
+  }, [labelPurchasedSalesOrderShipment, manuallyCreatedShipmentId, pendingSalesOrderShipment]);
+  const showShipmentNotFoundError = React.useMemo(() => {
+    // Don't show error if we have a manually created shipment
+    if (manuallyCreatedShipmentId) {
+      return false;
+    }
+    // Don't show error if we're creating a V1 shipment
+    if (creatingV1Shipment || newV1Shipment) {
+      return false;
+    }
+    // For external shipment ID, show error if we're not in loading state
+    // and we don't have valid shipment data
+    if (externalShipmentId && !isConfigureShipmentLoading && !hasValidShipmentData) {
+      return true;
+    }
+    // Don't show error if external shipment is still loading, unless we have explicit errors
+    if (externalShipmentId && (isExternalShipmentInitialLoading || isExternalShipmentFetching) && !getExternalShipmentErrors) {
+      return false;
+    }
+    // Show error immediately if we have shipment errors, even if still loading
+    if (hasGetShipmentErrors) {
+      return true;
+    }
+    // Check if this is a one-off flow (no identifiers provided)
+    const isOneOffFlow = !salesOrderId && !externalOrderId && !externalOrderNumber && !orderSourceCode && !shipmentId && !externalShipmentId;
+    // Don't show error for one-off flow until we've attempted shipment creation
+    if (isOneOffFlow && !v1shipmentCreated) {
+      return false;
+    }
+    // Otherwise, only show if not loading and no valid shipment data
+    return !isConfigureShipmentLoading && !hasValidShipmentData;
+  }, [manuallyCreatedShipmentId, creatingV1Shipment, newV1Shipment, hasGetShipmentErrors, isExternalShipmentInitialLoading, isExternalShipmentFetching, getExternalShipmentErrors, listSalesOrderShipmentsErrors, importSalesOrderErrors, salesOrderId, externalOrderId, externalOrderNumber, orderSourceCode, shipmentId, externalShipmentId, v1shipmentCreated, isConfigureShipmentLoading, hasValidShipmentData, pendingSalesOrderShipment, externalShipment]);
+  const errors = [...(listWarehouseErrors !== null && listWarehouseErrors !== void 0 ? listWarehouseErrors : []), ...(createSalesOrderShipmentErrors !== null && createSalesOrderShipmentErrors !== void 0 ? createSalesOrderShipmentErrors : []), ...(createV1ShipmentErrors !== null && createV1ShipmentErrors !== void 0 ? createV1ShipmentErrors : []), ...(errorWhenShipmentCancelled && cancelledShipment ? [new reactApi.CodedError("shipment_cancelled", {
     errorCode: "invalid_status",
     errorSource: "elements",
     errorType: "business_rules"
@@ -200,16 +309,17 @@ const useConfigureShipment = ({
     errorCode: "unknown",
     errorSource: "elements",
     errorType: "business_rules"
-  })] : []), ...((salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) === 0 && shipmentId ? [new reactApi.CodedError("shipment_not_found", {
+  })] : []), ...(showShipmentNotFoundError ? [new reactApi.CodedError("shipment_not_found", {
     errorCode: "invalid_status",
     errorSource: "elements",
     errorType: "business_rules"
   })] : [])];
+  // #endregion
   return {
     carriers,
     createNewShipmentForNotFound,
     errors: errors.length > 0 ? errors : undefined,
-    isLoading: (isSalesOrderLoading || !(salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) || creatingSalesOrderShipment) && errors.length === 0,
+    isLoading: isConfigureShipmentLoading && errors.length === 0,
     refetchPendingSalesOrderShipments,
     salesOrder: salesOrder$1,
     shipment: pendingSalesOrderShipment !== null && pendingSalesOrderShipment !== void 0 ? pendingSalesOrderShipment : labelPurchasedSalesOrderShipment,

package/dist/cjs/hooks/use-import-sales-order.cjs

@@ -5,26 +5,49 @@ var reactApi = require('@shipengine/react-api');
 var reactQuery = require('@tanstack/react-query');
 var React = require('react');
 
+/**
+ * Imports and retrieves sales orders by either:
+ * - Sales order ID lookup
+ * - External order ID/number search
+ *
+ * 1. First attempts to find the sales order using provided identifiers
+ * 2. If no order is found and initial fetches have run, automatically refreshes order sources
+ * 3. Invalidates relevant queries after successful refresh to refetch updated data
+ *
+ * @returns Object:
+ * - `salesOrder`: The found sales order, or undefined
+ * - `isLoading`: Boolean indicating if the hook is currently loading data
+ * - `errors`: Array of errors from failed queries, or undefined
+ */
 const useImportSalesOrder = ({
   enabled,
   externalOrderId,
+  externalOrderNumber,
   orderSourceCode,
   salesOrderId
 }) => {
   var _a, _b, _c;
   const queryClient = reactQuery.useQueryClient();
   const [refreshAttempted, setRefreshAttempted] = React.useState(false);
-  // attempt to get sales order through external id means
-  const orderByExternalIdQuery = reactApi.useGetSalesOrderByExternalOrderId(externalOrderId, {
-    enabled: enabled && !!externalOrderId && !salesOrderId
+  // Fetch sales order by External Order ID or External Order Number
+  const salesOrderByExternalIdQuery = reactApi.useListSalesOrders({
+    externalOrderId,
+    externalOrderNumber
   });
   // if an order was found through external search disable this query
-  const orderByIdQuery = reactApi.useGetSalesOrder(salesOrderId, {
+  const salesOrderByIdQuery = reactApi.useGetSalesOrder(salesOrderId, {
     enabled: enabled && !!salesOrderId
   });
-  const salesOrder = React.useMemo(() => salesOrderId ? orderByIdQuery.data : orderByExternalIdQuery.data, [salesOrderId, orderByIdQuery.data, orderByExternalIdQuery.data]);
+  const salesOrder = React.useMemo(() => {
+    if (salesOrderId) {
+      return salesOrderByIdQuery.data;
+    } else if (salesOrderByExternalIdQuery.data && salesOrderByExternalIdQuery.data.length > 0) {
+      return salesOrderByExternalIdQuery.data[0];
+    }
+    return undefined;
+  }, [salesOrderId, salesOrderByIdQuery.data, salesOrderByExternalIdQuery.data]);
   // Determine if the initial fetch attempts (if applicable) have settled without finding data
-  const initialFetchSettled = (salesOrderId ? !orderByIdQuery.isInitialLoading && !orderByIdQuery.isFetching : true) && (externalOrderId && !salesOrderId ? !orderByExternalIdQuery.isLoading && !orderByExternalIdQuery.isFetching : true);
+  const initialFetchSettled = (salesOrderId ? !salesOrderByIdQuery.isInitialLoading && !salesOrderByIdQuery.isFetching : true) && ((externalOrderNumber || externalOrderId) && !salesOrderId ? !salesOrderByExternalIdQuery.isLoading && !salesOrderByExternalIdQuery.isFetching : true);
   const shouldAttemptRefresh = enabled && initialFetchSettled && !salesOrder && !refreshAttempted;
   const listOrderSourcesQuery = reactApi.useListOrderSources({
     enabled: shouldAttemptRefresh
@@ -34,6 +57,17 @@ const useImportSalesOrder = ({
     isLoading: isRefreshingOrderSource,
     mutateAsync: refreshOrderSource
   } = reactApi.useRefreshOrderSource();
+  const invalidateSalesOrderQueries = React.useCallback(() => {
+    if (salesOrderId) {
+      void queryClient.invalidateQueries({
+        queryKey: ["useGetSalesOrder", salesOrderId]
+      });
+    } else if (externalOrderId || externalOrderNumber) {
+      void queryClient.invalidateQueries({
+        queryKey: ["useListSalesOrders", externalOrderId, externalOrderNumber]
+      });
+    }
+  }, [queryClient, salesOrderId, externalOrderId, externalOrderNumber]);
   React.useEffect(() => {
     if (listOrderSourcesQuery.isSuccess && listOrderSourcesQuery.data && shouldAttemptRefresh && !isRefreshingOrderSource) {
       const orderSourcesToRefresh = orderSourceCode ? listOrderSourcesQuery.data.filter(o => o.orderSourceCode.includes(orderSourceCode) && o.active) : listOrderSourcesQuery.data.filter(o => o.active);
@@ -41,29 +75,20 @@ const useImportSalesOrder = ({
         setRefreshAttempted(true);
         void (() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
           yield Promise.all(orderSourcesToRefresh.map(o => refreshOrderSource(o.orderSourceId, {
-            // Invalidate relevant queries on successful refresh
+            // Invalidate relevant queries
             onSuccess: () => {
-              if (salesOrderId) {
-                void queryClient.invalidateQueries({
-                  queryKey: ["useGetSalesOrder", salesOrderId]
-                });
-              }
-              if (externalOrderId && !salesOrderId) {
-                void queryClient.invalidateQueries({
-                  queryKey: ["useGetSalesOrderByExternalOrderId", externalOrderId]
-                });
-              }
+              invalidateSalesOrderQueries();
             }
           })));
         }))();
       }
     }
   }, [externalOrderId, isRefreshingOrderSource, listOrderSourcesQuery.data, listOrderSourcesQuery.isSuccess, orderSourceCode, queryClient, refreshOrderSource, salesOrderId, shouldAttemptRefresh]);
-  const isLoading = orderByIdQuery.isInitialLoading || orderByExternalIdQuery.isInitialLoading || listOrderSourcesQuery.isInitialLoading || isRefreshingOrderSource;
-  const errors = [...((_a = orderByIdQuery.error) !== null && _a !== void 0 ? _a : []), ...((_b = orderByExternalIdQuery.error) !== null && _b !== void 0 ? _b : []), ...((_c = listOrderSourcesQuery.error) !== null && _c !== void 0 ? _c : []), ...(refreshOrderSourceErrors !== null && refreshOrderSourceErrors !== void 0 ? refreshOrderSourceErrors : [])];
+  const isLoading = salesOrderByIdQuery.isInitialLoading || salesOrderByExternalIdQuery.isInitialLoading || listOrderSourcesQuery.isInitialLoading || isRefreshingOrderSource;
+  const errors = [...((_a = salesOrderByIdQuery.error) !== null && _a !== void 0 ? _a : []), ...((_b = salesOrderByExternalIdQuery.error) !== null && _b !== void 0 ? _b : []), ...((_c = listOrderSourcesQuery.error) !== null && _c !== void 0 ? _c : []), ...(refreshOrderSourceErrors !== null && refreshOrderSourceErrors !== void 0 ? refreshOrderSourceErrors : [])];
   return {
     errors: errors.length > 0 ? errors : undefined,
-    isLoading,
+    isLoading: isLoading && errors.length === 0,
     salesOrder
   };
 };

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

@@ -170,7 +170,7 @@ var common = {
 		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}}.",
+		shipmentNotFound: "Cannot find {{identifierType}}: {{identifierNumber}}",
 		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

@@ -32,6 +32,13 @@ var purchaseLabel = {
 		saveRateFailedMessage: "Saving DHL Express Worldwide rates is temporarily unavailable. Please try again later.",
 		saveRateFailedTitle: "Unable To Save Rate"
 	},
+	identifierTypes: {
+		externalOrderId: "External Order ID",
+		externalOrderNumber: "External Order Number",
+		externalShipmentId: "External Shipment ID",
+		salesOrderId: "Sales Order ID",
+		shipmentId: "Shipment ID"
+	},
 	errorTypes: {
 		results: "No results returned"
 	},

package/dist/cjs/package.json.cjs

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

package/dist/cjs/workflows/connect-external-carrier/components/custom-external-carrier-form/custom-form-fedex.cjs

@@ -112,7 +112,7 @@ const supportedCountriesUK = [{
 const fedexJsonSchema = isUK => ({
   description: `You'll need an existing FedEx account to complete this form. If you don't have a FedEx account, please <a href="${newAccountHref}" target="_blank" rel="noopener noreferrer">click here to open one now!</a>`,
   properties: {
-    accountNumber: {
+    account_number: {
       maxLength: 50,
       title: "FedEx Account No",
       type: "string"
@@ -129,7 +129,7 @@ const fedexJsonSchema = isUK => ({
       title: "Address Line 2",
       type: "string"
     },
-    agreeToEula: {
+    agree_to_eula: {
       title: "I agree to the End-User License Agreement",
       type: "boolean"
     },
@@ -143,7 +143,7 @@ const fedexJsonSchema = isUK => ({
       title: "Company Name",
       type: "string"
     },
-    countryCode: {
+    country_code: {
       oneOf: isUK ? supportedCountriesUK : supportedCountries,
       title: "Country",
       type: "string"
@@ -153,13 +153,13 @@ const fedexJsonSchema = isUK => ({
       title: "Email",
       type: "string"
     },
-    firstName: {
+    first_name: {
       // TODO: Can we make firstname/lastname in the same row?
       maxLength: 50,
       title: "Contact First Name",
       type: "string"
     },
-    lastName: {
+    last_name: {
       // TODO: Can we make firstname/lastname in the same row?
       maxLength: 50,
       title: "Contact Last Name",
@@ -174,7 +174,7 @@ const fedexJsonSchema = isUK => ({
       title: "Phone #",
       type: "string"
     },
-    postalCode: {
+    postal_code: {
       // TODO: Can we make this reactive to country selection? Can we group State/Zip?
       maxLength: 8,
       title: "Zip/Postal Code",
@@ -187,16 +187,16 @@ const fedexJsonSchema = isUK => ({
       type: "string"
     }
   },
-  required: ["accountNumber", "firstName", "lastName", "email", "countryCode", "address1", "city", "state", "postalCode", "phone", "nickname"],
+  required: ["account_number", "first_name", "last_name", "email", "country_code", "address1", "city", "state", "postal_code", "phone", "nickname"],
   title: "Connect Your FedEx Account",
   type: "object"
 });
 const fedexUiSchema = {
-  accountNumber: {
+  account_number: {
     "ui:autofocus": true,
     "ui:emptyValue": ""
   },
-  agreeToEula: {
+  agree_to_eula: {
     "ui:widget": "hidden"
   },
   email: {
@@ -209,7 +209,7 @@ const fedexUiSchema = {
       inputType: "tel"
     }
   },
-  "ui:order": ["accountNumber", "firstName", "lastName", "company", "email", "countryCode", "address1", "address2", "city", "state", "postalCode", "phone", "agreeToEula", "nickname"]
+  "ui:order": ["account_number", "first_name", "last_name", "company", "email", "country_code", "address1", "address2", "city", "state", "postal_code", "phone", "agree_to_eula", "nickname"]
 };
 const CustomExternalCarrierFormFedex = ({
   carrierName,
@@ -232,7 +232,7 @@ const CustomExternalCarrierFormFedex = ({
       displayName: displayName,
       iconUrl: iconUrl,
       initialFormData: {
-        agreeToEula,
+        agree_to_eula: agreeToEula,
         nickname: ""
       },
       isBeta: isBeta,