@shipengine/elements 2.26.4 → 2.26.5

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

@@ -7,26 +7,12 @@ var reactI18next = require('react-i18next');
 var shipmentNotFoundError_styles = require('./shipment-not-found-error.styles.cjs');
 
 const ShipmentNotFoundError = ({
-  identifier,
+  shipmentId,
   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", {
@@ -38,8 +24,7 @@ const ShipmentNotFoundError = ({
     }), jsxRuntime.jsx("div", {
       css: shipmentNotFoundError_styles.styles.message,
       children: t("common:errorMessages.shipmentNotFound", {
-        identifierType,
-        identifierNumber
+        id: shipmentId
       })
     }), 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,
-  identifier
+  shipmentId
 }) => {
   const {
     t
@@ -38,8 +38,8 @@ const SuspendPurchase = ({
           throw new Error(t("common:errorMessages.labelHasBeenPurchased"));
         case "shipment_not_found":
           return jsxRuntime.jsx(shipmentNotFoundError.ShipmentNotFoundError, {
-            identifier: identifier,
-            onCreateNewShipment: onCreateNewShipment
+            onCreateNewShipment: onCreateNewShipment,
+            shipmentId: shipmentId
           });
       }
     }

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

@@ -92,15 +92,9 @@ 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 user manually created a shipment for a "not found" case
-  const [manuallyCreatedShipmentId, setManuallyCreatedShipmentId] = React.useState();
+  // 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 {
@@ -47,7 +47,6 @@ const useConfigureShipment = ({
     // Dont run Sales Order Import unless the Sales order info is present
     enabled: !!externalOrderNumber || !!orderSourceCode || !!salesOrderId || !!externalOrderId,
     externalOrderId,
-    externalOrderNumber,
     orderSourceCode,
     salesOrderId
   });
@@ -64,49 +63,24 @@ const useConfigureShipment = ({
     isInitialLoading: isExternalShipmentInitialLoading,
     isFetching: isExternalShipmentFetching
   } = reactApi.useGetShipmentByExternalId({
-    enabled: !!externalShipmentId && !shipmentId && !manuallyCreatedShipmentId,
+    enabled: !!externalShipmentId && !shipmentId,
     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(listSalesOrderShipmentsParams);
-  // #endregion
+  } = 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
+  });
   const {
     error: createSalesOrderShipmentErrors,
     mutateAsync: createSalesOrderShipment,
@@ -131,7 +105,6 @@ 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;
@@ -181,23 +154,17 @@ const useConfigureShipment = ({
     }
     // Create a Shipment for one-off flow
     if (!salesOrderId && !externalOrderId && !externalOrderNumber && !orderSourceCode && !shipmentId && !externalShipmentId) {
-      const v1Shipment = yield createV1ShipmentWithDefaults();
-      // Set manuallyCreatedShipmentId to ensure proper query parameter handling
-      if (v1Shipment) {
-        setManuallyCreatedShipmentId(v1Shipment.shipments[0].shipmentId);
-      }
+      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]);
-  // #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) {
-      setManuallyCreatedShipmentId(v1Shipment.shipments[0].shipmentId);
-      // Refetch to ensure we have the latest shipment data
-      yield refetchSalesOrderShipments();
+      // Store the new shipment ID to override the stale one
+      setReplacementShipmentId(v1Shipment.shipments[0].shipmentId);
     }
-  }), [createV1ShipmentWithDefaults, refetchSalesOrderShipments]);
+  }), [createV1ShipmentWithDefaults]);
   const refetchPendingSalesOrderShipments = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const {
       data: shipments
@@ -221,83 +188,7 @@ 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 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", {
+  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", {
     errorCode: "invalid_status",
     errorSource: "elements",
     errorType: "business_rules"
@@ -309,17 +200,16 @@ const useConfigureShipment = ({
     errorCode: "unknown",
     errorSource: "elements",
     errorType: "business_rules"
-  })] : []), ...(showShipmentNotFoundError ? [new reactApi.CodedError("shipment_not_found", {
+  })] : []), ...((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"
   })] : [])];
-  // #endregion
   return {
     carriers,
     createNewShipmentForNotFound,
     errors: errors.length > 0 ? errors : undefined,
-    isLoading: isConfigureShipmentLoading && errors.length === 0,
+    isLoading: (isSalesOrderLoading || !(salesOrderShipments === null || salesOrderShipments === void 0 ? void 0 : salesOrderShipments.length) || creatingSalesOrderShipment) && 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,49 +5,26 @@ 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);
-  // Fetch sales order by External Order ID or External Order Number
-  const salesOrderByExternalIdQuery = reactApi.useListSalesOrders({
-    externalOrderId,
-    externalOrderNumber
+  // attempt to get sales order through external id means
+  const orderByExternalIdQuery = reactApi.useGetSalesOrderByExternalOrderId(externalOrderId, {
+    enabled: enabled && !!externalOrderId && !salesOrderId
   });
   // if an order was found through external search disable this query
-  const salesOrderByIdQuery = reactApi.useGetSalesOrder(salesOrderId, {
+  const orderByIdQuery = reactApi.useGetSalesOrder(salesOrderId, {
     enabled: enabled && !!salesOrderId
   });
-  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]);
+  const salesOrder = React.useMemo(() => salesOrderId ? orderByIdQuery.data : orderByExternalIdQuery.data, [salesOrderId, orderByIdQuery.data, orderByExternalIdQuery.data]);
   // Determine if the initial fetch attempts (if applicable) have settled without finding data
-  const initialFetchSettled = (salesOrderId ? !salesOrderByIdQuery.isInitialLoading && !salesOrderByIdQuery.isFetching : true) && ((externalOrderNumber || externalOrderId) && !salesOrderId ? !salesOrderByExternalIdQuery.isLoading && !salesOrderByExternalIdQuery.isFetching : true);
+  const initialFetchSettled = (salesOrderId ? !orderByIdQuery.isInitialLoading && !orderByIdQuery.isFetching : true) && (externalOrderId && !salesOrderId ? !orderByExternalIdQuery.isLoading && !orderByExternalIdQuery.isFetching : true);
   const shouldAttemptRefresh = enabled && initialFetchSettled && !salesOrder && !refreshAttempted;
   const listOrderSourcesQuery = reactApi.useListOrderSources({
     enabled: shouldAttemptRefresh
@@ -57,17 +34,6 @@ 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);
@@ -75,20 +41,29 @@ 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
+            // Invalidate relevant queries on successful refresh
             onSuccess: () => {
-              invalidateSalesOrderQueries();
+              if (salesOrderId) {
+                void queryClient.invalidateQueries({
+                  queryKey: ["useGetSalesOrder", salesOrderId]
+                });
+              }
+              if (externalOrderId && !salesOrderId) {
+                void queryClient.invalidateQueries({
+                  queryKey: ["useGetSalesOrderByExternalOrderId", externalOrderId]
+                });
+              }
             }
           })));
         }))();
       }
     }
   }, [externalOrderId, isRefreshingOrderSource, listOrderSourcesQuery.data, listOrderSourcesQuery.isSuccess, orderSourceCode, queryClient, refreshOrderSource, salesOrderId, shouldAttemptRefresh]);
-  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 : [])];
+  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 : [])];
   return {
     errors: errors.length > 0 ? errors : undefined,
-    isLoading: isLoading && errors.length === 0,
+    isLoading,
     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 {{identifierType}}: {{identifierNumber}}",
+		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

@@ -32,13 +32,6 @@ 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.4";
+var version = "2.26.5";
 
 exports.version = version;

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

@@ -62,31 +62,7 @@ const Component = _a => {
   }));
   // 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 getMultiplexedIdentifier = React.useCallback(() => {
-    if (_multiplexedId && "shipmentId" in _multiplexedId) {
-      return {
-        shipmentId: _multiplexedId.shipmentId
-      };
-    } else if (_multiplexedId && "externalShipmentId" in _multiplexedId) {
-      return {
-        externalShipmentId: _multiplexedId.externalShipmentId
-      };
-    } else if (_multiplexedId && "salesOrderId" in _multiplexedId) {
-      return {
-        salesOrderId: _multiplexedId.salesOrderId
-      };
-    } else if (_multiplexedId && "externalOrderNumber" in _multiplexedId) {
-      return {
-        externalOrderNumber: _multiplexedId.externalOrderNumber
-      };
-    } else if (_multiplexedId && "externalOrderId" in _multiplexedId) {
-      return {
-        externalOrderId: _multiplexedId.externalOrderId
-      };
-    }
-    return {};
-  }, [_multiplexedId]);
-  const shipmentId = getMultiplexedIdentifier().shipmentId;
+  const shipmentId = _multiplexedId && "shipmentId" in _multiplexedId ? _multiplexedId.shipmentId : undefined;
   const {
     data: insuranceAccount,
     isInitialLoading: insuranceIsLoading
@@ -204,9 +180,9 @@ const Component = _a => {
   return jsxRuntime.jsx(suspendPurchase.SuspendPurchase, {
     data: shipment$1 || salesOrder,
     errors: errors.length ? errors : undefined,
-    identifier: getMultiplexedIdentifier(),
     isLoading: isLabelsLoading || isConfiguringShipment || insuranceIsLoading,
     onCreateNewShipment: createNewShipmentForNotFound,
+    shipmentId: shipmentId,
     children: element && getElement(element)
   });
 };

package/dist/esm/components/shipment-not-found-error/shipment-not-found-error.js

@@ -5,26 +5,12 @@ import { useTranslation } from 'react-i18next';
 import { styles } from './shipment-not-found-error.styles.js';
 
 const ShipmentNotFoundError = ({
-  identifier,
+  shipmentId,
   onCreateNewShipment
 }) => {
   const {
     t
   } = 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 jsxs("div", {
     css: styles.container,
     children: [jsx("div", {
@@ -36,8 +22,7 @@ const ShipmentNotFoundError = ({
     }), jsx("div", {
       css: styles.message,
       children: t("common:errorMessages.shipmentNotFound", {
-        identifierType,
-        identifierNumber
+        id: shipmentId
       })
     }), jsx(Button, {
       "data-testid": "create-new-shipment",

package/dist/esm/components/suspend-purchase/suspend-purchase.js

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

package/dist/esm/elements/purchase-label/purchase-label.js

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