@mercurjs/admin 2.1.2-canary.5 → 2.1.3

package/dist/{order-create-claim-PLC342V5.js → order-create-claim-R2SX6YUS.js}

@@ -57,8 +57,8 @@ import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-KLVTWJ4M.js";
-import "./chunk-YBZWO4ZV.js";
+} from "./chunk-KYPPQGGE.js";
+import "./chunk-ZMC7BKLT.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-634XVU3D.js";
 import {
@@ -76,8 +76,8 @@ import {
 } from "./chunk-BDGZ4EQO.js";
 import "./chunk-LAVHRER2.js";
 import "./chunk-Y7QKP6QU.js";
-import "./chunk-KBYZLKI4.js";
-import "./chunk-YWWUOGJA.js";
+import "./chunk-HKDFWQ6Q.js";
+import "./chunk-SESTTUVM.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
@@ -631,7 +631,7 @@ function ClaimInboundItem({
             {
               control: form.control,
               name: `inbound_items.${index}.reason_id`,
-              render: ({ field: { ref, value, onChange, ...field } }) => {
+              render: ({ field: { ref: _ref, value, onChange, ...field } }) => {
                 return /* @__PURE__ */ jsxs(Form.Item, { children: [
                   /* @__PURE__ */ jsx3(Form.Control, { children: /* @__PURE__ */ jsx3(
                     Combobox,
@@ -680,7 +680,7 @@ function ClaimInboundItem({
             {
               control: form.control,
               name: `inbound_items.${index}.note`,
-              render: ({ field: { ref, ...field } }) => {
+              render: ({ field: { ref: _ref, ...field } }) => {
                 return /* @__PURE__ */ jsxs(Form.Item, { children: [
                   /* @__PURE__ */ jsx3(Form.Control, { children: /* @__PURE__ */ jsx3(
                     Input,
@@ -758,7 +758,7 @@ import { useMemo as useMemo3 } from "react";
 import { useTranslation as useTranslation5 } from "react-i18next";
 import { jsx as jsx4 } from "react/jsx-runtime";
 var columnHelper2 = createColumnHelper2();
-var useClaimOutboundItemTableColumns = (currencyCode) => {
+var useClaimOutboundItemTableColumns = (_currencyCode) => {
   const { t } = useTranslation5();
   return useMemo3(
     () => [
@@ -805,7 +805,7 @@ var useClaimOutboundItemTableColumns = (currencyCode) => {
         header: t("fields.title")
       })
     ],
-    [t, currencyCode]
+    [t]
   );
 };
 
@@ -1049,7 +1049,7 @@ var ClaimOutboundSection = ({
         (a) => a.claim_id === claim.id && a.action === "ITEM_ADD"
       )
     ),
-    [preview.items]
+    [preview.items, claim.id]
   );
   const variantItemMap = useMemo4(
     () => new Map(order?.items?.map((i) => [i.variant_id, i])),
@@ -1066,7 +1066,7 @@ var ClaimOutboundSection = ({
   });
   const variantOutboundMap = useMemo4(
     () => new Map(previewOutboundItems.map((i) => [i.variant_id, i])),
-    [previewOutboundItems, outboundItems]
+    [previewOutboundItems]
   );
   useEffect(() => {
     const existingItemsMap = {};
@@ -1096,23 +1096,31 @@ var ClaimOutboundSection = ({
         remove(ind);
       }
     });
-  }, [previewOutboundItems]);
+  }, [
+    previewOutboundItems,
+    remove,
+    outboundItems,
+    append,
+    update
+  ]);
   const locationId = form.watch("location_id");
   const showOutboundItemsPlaceholder = !outboundItems.length;
   const onItemsSelected = async () => {
-    itemsToAdd.length && await addOutboundItem(
-      {
-        items: itemsToAdd.map((variantId) => ({
-          variant_id: variantId,
-          quantity: 1
-        }))
-      },
-      {
-        onError: (error) => {
-          toast.error(error.message);
+    if (itemsToAdd.length) {
+      await addOutboundItem(
+        {
+          items: itemsToAdd.map((variantId) => ({
+            variant_id: variantId,
+            quantity: 1
+          }))
+        },
+        {
+          onError: (error) => {
+            toast.error(error.message);
+          }
         }
-      }
-    );
+      );
+    }
     for (const itemToRemove of itemsToRemove) {
       const action = previewOutboundItems.find((i) => i.variant_id === itemToRemove)?.actions?.find((a) => a.action === "ITEM_ADD");
       if (action?.id) {
@@ -1130,7 +1138,7 @@ var ClaimOutboundSection = ({
       const action = s.actions?.find(
         (a) => a.action === "SHIPPING_ADD" && !a.return_id
       );
-      return action && !!!action?.return_id;
+      return action && !action?.return_id;
     });
     const promises = outboundShippingMethods.filter(Boolean).map((outboundShippingMethod) => {
       const action = outboundShippingMethod.actions?.find(
@@ -1169,7 +1177,12 @@ var ClaimOutboundSection = ({
       );
     }).every(Boolean);
     return !allItemsHaveLocation;
-  }, [outboundItems, inventoryMap, locationId]);
+  }, [
+    outboundItems,
+    inventoryMap,
+    locationId,
+    variantItemMap
+  ]);
   useEffect(() => {
     const getInventoryMap = async () => {
       const ret = {};
@@ -1194,7 +1207,7 @@ var ClaimOutboundSection = ({
     /* @__PURE__ */ jsxs3("div", { className: "mt-8 flex items-center justify-between", children: [
       /* @__PURE__ */ jsx7(Heading, { level: "h2", children: t("orders.returns.outbound") }),
       /* @__PURE__ */ jsxs3(StackedFocusModal, { id: "outbound-items", children: [
-        /* @__PURE__ */ jsx7(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx7("a", { className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
+        /* @__PURE__ */ jsx7(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx7("button", { type: "button", className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
         /* @__PURE__ */ jsxs3(StackedFocusModal.Content, { children: [
           /* @__PURE__ */ jsx7(StackedFocusModal.Header, {}),
           /* @__PURE__ */ jsx7(
@@ -1218,6 +1231,7 @@ var ClaimOutboundSection = ({
             /* @__PURE__ */ jsx7(
               Button,
               {
+                tabIndex: 0,
                 type: "submit",
                 variant: "primary",
                 size: "small",
@@ -1362,7 +1376,7 @@ var ClaimCreateForm = ({
     () => preview?.items?.filter(
       (i) => !!i.actions?.find((a) => a.claim_id === claim.id)
     ),
-    [preview.items]
+    [preview.items, claim.id]
   );
   const inboundPreviewItems = previewItems.filter(
     (item) => !!item.actions?.find((a) => a.action === "RETURN_ITEM")
@@ -1448,7 +1462,7 @@ var ClaimCreateForm = ({
         float: inboundShipping.total
       });
     }
-  }, [inboundShipping]);
+  }, [inboundShipping, order.currency_code]);
   useEffect2(() => {
     if (outboundShipping) {
       setCustomOutboundShippingAmount({
@@ -1458,7 +1472,7 @@ var ClaimCreateForm = ({
         float: outboundShipping.total
       });
     }
-  }, [outboundShipping]);
+  }, [outboundShipping, order.currency_code]);
   const {
     fields: inboundItems,
     append,
@@ -1470,7 +1484,7 @@ var ClaimCreateForm = ({
   });
   const previewItemsMap = useMemo5(
     () => new Map(previewItems.map((i) => [i.id, i])),
-    [previewItems, inboundItems]
+    [previewItems]
   );
   useEffect2(() => {
     const existingItemsMap = {};
@@ -1501,7 +1515,14 @@ var ClaimCreateForm = ({
         remove(ind);
       }
     });
-  }, [previewItems]);
+  }, [
+    previewItems,
+    inboundItems,
+    remove,
+    inboundPreviewItems,
+    append,
+    update
+  ]);
   useEffect2(() => {
     const inboundShipping2 = preview.shipping_methods.find(
       (s) => !!s.actions?.find((a) => a.action === "SHIPPING_ADD" && !!a.return_id)
@@ -1519,10 +1540,10 @@ var ClaimCreateForm = ({
     } else {
       form.setValue("outbound_option_id", null);
     }
-  }, [preview.shipping_methods]);
+  }, [preview.shipping_methods, form]);
   useEffect2(() => {
     form.setValue("location_id", orderReturn?.location_id);
-  }, [orderReturn]);
+  }, [orderReturn, form]);
   const showInboundItemsPlaceholder = !inboundPreviewItems.length;
   const showOutboundItemsPlaceholder = !outboundPreviewItems.length;
   const inboundShippingOptionId = form.watch("inbound_option_id");
@@ -1553,19 +1574,21 @@ var ClaimCreateForm = ({
     );
   });
   const onItemsSelected = async () => {
-    itemsToAdd2.length && await addInboundItem(
-      {
-        items: itemsToAdd2.map((id) => ({
-          id,
-          quantity: 1
-        }))
-      },
-      {
-        onError: (error) => {
-          toast2.error(error.message);
+    if (itemsToAdd2.length) {
+      await addInboundItem(
+        {
+          items: itemsToAdd2.map((id) => ({
+            id,
+            quantity: 1
+          }))
+        },
+        {
+          onError: (error) => {
+            toast2.error(error.message);
+          }
         }
-      }
-    );
+      );
+    }
     for (const itemToRemove of itemsToRemove2) {
       const actionId = previewItems.find((i) => i.id === itemToRemove)?.actions?.find((a) => a.action === "RETURN_ITEM")?.id;
       if (actionId) {
@@ -1635,7 +1658,12 @@ var ClaimCreateForm = ({
       );
     }).every(Boolean);
     return !allItemsHaveLocation;
-  }, [inboundItems, inventoryMap, locationId]);
+  }, [
+    inboundItems,
+    inventoryMap,
+    locationId,
+    itemsMap
+  ]);
   useEffect2(() => {
     const getInventoryMap = async () => {
       const ret = {};
@@ -1670,7 +1698,7 @@ var ClaimCreateForm = ({
         IS_CANCELING = false;
       }
     };
-  }, []);
+  }, [t, cancelClaimRequest]);
   const inboundShippingTotal = useMemo5(() => {
     const method = preview.shipping_methods.find(
       (sm) => !!sm.actions?.find((a) => a.action === "SHIPPING_ADD" && !!a.return_id)
@@ -1695,7 +1723,7 @@ var ClaimCreateForm = ({
           /* @__PURE__ */ jsxs4("div", { className: "mt-8 flex items-center justify-between", children: [
             /* @__PURE__ */ jsx8(Heading2, { level: "h2", children: t("orders.returns.inbound") }),
             /* @__PURE__ */ jsxs4(StackedFocusModal, { id: "inbound-items", children: [
-              /* @__PURE__ */ jsx8(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx8("a", { className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
+              /* @__PURE__ */ jsx8(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx8("button", { type: "button", className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
               /* @__PURE__ */ jsxs4(StackedFocusModal.Content, { children: [
                 /* @__PURE__ */ jsx8(StackedFocusModal.Header, {}),
                 /* @__PURE__ */ jsx8(
@@ -1730,6 +1758,7 @@ var ClaimCreateForm = ({
                   /* @__PURE__ */ jsx8(
                     Button2,
                     {
+                      tabIndex: 0,
                       type: "submit",
                       variant: "primary",
                       size: "small",
@@ -2193,7 +2222,12 @@ var ClaimCreate = () => {
       }
     }
     run();
-  }, [preview]);
+  }, [
+    preview,
+    navigate,
+    t,
+    createClaim
+  ]);
   return /* @__PURE__ */ jsx9(RouteFocusModal, { "data-testid": "order-create-claim-modal", children: claim && preview && order && /* @__PURE__ */ jsx9(
     ClaimCreateForm,
     {

package/dist/{order-create-edit-25CJG3KZ.js → order-create-edit-G35PDCQ2.js}

@@ -28,8 +28,8 @@ import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-KLVTWJ4M.js";
-import "./chunk-YBZWO4ZV.js";
+} from "./chunk-KYPPQGGE.js";
+import "./chunk-ZMC7BKLT.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-634XVU3D.js";
 import "./chunk-IQPN4PZJ.js";
@@ -43,8 +43,8 @@ import {
 } from "./chunk-BDGZ4EQO.js";
 import "./chunk-LAVHRER2.js";
 import "./chunk-Y7QKP6QU.js";
-import "./chunk-KBYZLKI4.js";
-import "./chunk-YWWUOGJA.js";
+import "./chunk-HKDFWQ6Q.js";
+import "./chunk-SESTTUVM.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
@@ -130,7 +130,7 @@ import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { jsx } from "react/jsx-runtime";
 var columnHelper = createColumnHelper();
-var useOrderEditItemsTableColumns = (currencyCode) => {
+var useOrderEditItemsTableColumns = (_currencyCode) => {
   const { t } = useTranslation();
   return useMemo(
     () => [
@@ -177,7 +177,7 @@ var useOrderEditItemsTableColumns = (currencyCode) => {
         header: t("fields.title")
       })
     ],
-    [t, currencyCode]
+    [t]
   );
 };
 
@@ -509,7 +509,6 @@ var OrderEditItemsSection = ({
     };
   }, [debouncedOnChange]);
   const filteredItems = useMemo3(() => {
-    const lowerFilterTerm = filterTerm.toLowerCase();
     return preview.items.filter(
       (i) => i.title.toLowerCase().includes(filterTerm) || i.product_title?.toLowerCase().includes(filterTerm)
     );
@@ -930,7 +929,12 @@ var OrderEditCreate = () => {
       }
     }
     run();
-  }, [preview]);
+  }, [
+    preview,
+    createOrderEdit,
+    navigate,
+    t
+  ]);
   return /* @__PURE__ */ jsx6(RouteFocusModal, { "data-testid": "order-edit-create-modal", children: preview && order && /* @__PURE__ */ jsx6(OrderEditCreateForm, { order, preview }) });
 };
 export {

package/dist/{order-create-exchange-TK65KBGW.js → order-create-exchange-7KKMJHXE.js}

@@ -57,8 +57,8 @@ import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-KLVTWJ4M.js";
-import "./chunk-YBZWO4ZV.js";
+} from "./chunk-KYPPQGGE.js";
+import "./chunk-ZMC7BKLT.js";
 import "./chunk-KAZ5BYTQ.js";
 import "./chunk-634XVU3D.js";
 import {
@@ -76,8 +76,8 @@ import {
 } from "./chunk-BDGZ4EQO.js";
 import "./chunk-LAVHRER2.js";
 import "./chunk-Y7QKP6QU.js";
-import "./chunk-KBYZLKI4.js";
-import "./chunk-YWWUOGJA.js";
+import "./chunk-HKDFWQ6Q.js";
+import "./chunk-SESTTUVM.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
@@ -358,7 +358,7 @@ var AddExchangeInboundItemsTable = ({
       results = filterByDate(results, updated_at, "updated_at");
     }
     return results.slice(offset, offset + limit);
-  }, [items, currencyCode, searchParams]);
+  }, [items, searchParams]);
   const columns = useExchangeItemTableColumns(currencyCode);
   const filters = useExchangeItemTableFilters();
   const { table } = useDataTable({
@@ -560,7 +560,7 @@ function ExchangeInboundItem({
             {
               control: form.control,
               name: `inbound_items.${index}.reason_id`,
-              render: ({ field: { ref, value, onChange, ...field } }) => {
+              render: ({ field: { ref: _ref, value, onChange, ...field } }) => {
                 return /* @__PURE__ */ jsxs(Form.Item, { children: [
                   /* @__PURE__ */ jsx3(Form.Control, { children: /* @__PURE__ */ jsx3(
                     Combobox,
@@ -609,7 +609,7 @@ function ExchangeInboundItem({
             {
               control: form.control,
               name: `inbound_items.${index}.note`,
-              render: ({ field: { ref, ...field } }) => {
+              render: ({ field: { ref: _ref, ...field } }) => {
                 return /* @__PURE__ */ jsxs(Form.Item, { children: [
                   /* @__PURE__ */ jsx3(Form.Control, { children: /* @__PURE__ */ jsx3(
                     Input,
@@ -685,7 +685,7 @@ var ExchangeInboundSection = ({
     () => preview?.items?.filter(
       (i) => !!i.actions?.find((a) => a.exchange_id === exchange.id)
     ),
-    [preview.items]
+    [preview.items, exchange.id]
   );
   const inboundPreviewItems = previewInboundItems.filter(
     (item) => !!item.actions?.find((a) => a.action === "RETURN_ITEM")
@@ -722,7 +722,7 @@ var ExchangeInboundSection = ({
   });
   const inboundItemsMap = useMemo3(
     () => new Map(previewInboundItems.map((i) => [i.id, i])),
-    [previewInboundItems, inboundItems]
+    [previewInboundItems]
   );
   useEffect(() => {
     const existingItemsMap = {};
@@ -753,7 +753,14 @@ var ExchangeInboundSection = ({
         remove(ind);
       }
     });
-  }, [previewInboundItems]);
+  }, [
+    previewInboundItems,
+    inboundPreviewItems,
+    append,
+    update,
+    inboundItems,
+    remove
+  ]);
   useEffect(() => {
     const inboundShippingMethod = preview.shipping_methods.find(
       (s) => s.actions?.find((a) => a.action === "SHIPPING_ADD" && !!a.return_id)
@@ -766,25 +773,27 @@ var ExchangeInboundSection = ({
     } else {
       form.setValue("inbound_option_id", "");
     }
-  }, [preview.shipping_methods]);
+  }, [preview.shipping_methods, form]);
   useEffect(() => {
     form.setValue("location_id", orderReturn?.location_id);
-  }, [orderReturn]);
+  }, [orderReturn, form]);
   const showInboundItemsPlaceholder = !inboundItems.length;
   const onItemsSelected = async () => {
-    itemsToAdd.length && await addInboundItem(
-      {
-        items: itemsToAdd.map((id) => ({
-          id,
-          quantity: 1
-        }))
-      },
-      {
-        onError: (error) => {
-          toast.error(error.message);
+    if (itemsToAdd.length) {
+      await addInboundItem(
+        {
+          items: itemsToAdd.map((id) => ({
+            id,
+            quantity: 1
+          }))
+        },
+        {
+          onError: (error) => {
+            toast.error(error.message);
+          }
         }
-      }
-    );
+      );
+    }
     for (const itemToRemove of itemsToRemove) {
       const actionId = previewInboundItems.find((i) => i.id === itemToRemove)?.actions?.find((a) => a.action === "RETURN_ITEM")?.id;
       if (actionId) {
@@ -841,7 +850,12 @@ var ExchangeInboundSection = ({
       );
     }).every(Boolean);
     return !allItemsHaveLocation;
-  }, [inboundItems, inventoryMap, locationId]);
+  }, [
+    inboundItems,
+    inventoryMap,
+    locationId,
+    itemsMap
+  ]);
   useEffect(() => {
     const getInventoryMap = async () => {
       const ret = {};
@@ -866,7 +880,7 @@ var ExchangeInboundSection = ({
     /* @__PURE__ */ jsxs2("div", { className: "mt-8 flex items-center justify-between", children: [
       /* @__PURE__ */ jsx4(Heading, { level: "h2", children: t("orders.returns.inbound") }),
       /* @__PURE__ */ jsxs2(StackedFocusModal, { id: "inbound-items", children: [
-        /* @__PURE__ */ jsx4(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx4("a", { className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
+        /* @__PURE__ */ jsx4(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx4("button", { type: "button", className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
         /* @__PURE__ */ jsxs2(StackedFocusModal.Content, { children: [
           /* @__PURE__ */ jsx4(StackedFocusModal.Header, {}),
           /* @__PURE__ */ jsx4(
@@ -891,6 +905,7 @@ var ExchangeInboundSection = ({
             /* @__PURE__ */ jsx4(
               Button,
               {
+                tabIndex: 0,
                 type: "submit",
                 variant: "primary",
                 size: "small",
@@ -1053,7 +1068,7 @@ import { useMemo as useMemo4 } from "react";
 import { useTranslation as useTranslation6 } from "react-i18next";
 import { jsx as jsx5 } from "react/jsx-runtime";
 var columnHelper2 = createColumnHelper2();
-var useExchangeOutboundItemTableColumns = (currencyCode) => {
+var useExchangeOutboundItemTableColumns = (_currencyCode) => {
   const { t } = useTranslation6();
   return useMemo4(
     () => [
@@ -1100,7 +1115,7 @@ var useExchangeOutboundItemTableColumns = (currencyCode) => {
         header: t("fields.title")
       })
     ],
-    [t, currencyCode]
+    [t]
   );
 };
 
@@ -1343,7 +1358,7 @@ var ExchangeOutboundSection = ({
         (a) => a.exchange_id === exchange.id && a.action === "ITEM_ADD"
       )
     ),
-    [preview.items]
+    [preview.items, exchange.id]
   );
   const variantItemMap = useMemo5(
     () => new Map(order?.items?.map((i) => [i.variant_id, i])),
@@ -1360,7 +1375,7 @@ var ExchangeOutboundSection = ({
   });
   const variantOutboundMap = useMemo5(
     () => new Map(previewOutboundItems.map((i) => [i.variant_id, i])),
-    [previewOutboundItems, outboundItems]
+    [previewOutboundItems]
   );
   useEffect2(() => {
     const existingItemsMap = {};
@@ -1390,23 +1405,31 @@ var ExchangeOutboundSection = ({
         remove(ind);
       }
     });
-  }, [previewOutboundItems]);
+  }, [
+    previewOutboundItems,
+    remove,
+    outboundItems,
+    update,
+    append
+  ]);
   const locationId = form.watch("location_id");
   const showOutboundItemsPlaceholder = !outboundItems.length;
   const onItemsSelected = async () => {
-    itemsToAdd2.length && await addOutboundItem(
-      {
-        items: itemsToAdd2.map((variantId) => ({
-          variant_id: variantId,
-          quantity: 1
-        }))
-      },
-      {
-        onError: (error) => {
-          toast2.error(error.message);
+    if (itemsToAdd2.length) {
+      await addOutboundItem(
+        {
+          items: itemsToAdd2.map((variantId) => ({
+            variant_id: variantId,
+            quantity: 1
+          }))
+        },
+        {
+          onError: (error) => {
+            toast2.error(error.message);
+          }
         }
-      }
-    );
+      );
+    }
     for (const itemToRemove of itemsToRemove2) {
       const action = previewOutboundItems.find((i) => i.variant_id === itemToRemove)?.actions?.find((a) => a.action === "ITEM_ADD");
       if (action?.id) {
@@ -1428,7 +1451,7 @@ var ExchangeOutboundSection = ({
     } else {
       form.setValue("outbound_option_id", "");
     }
-  }, [preview.shipping_methods]);
+  }, [preview.shipping_methods, form]);
   const onShippingOptionChange = async (selectedOptionId) => {
     const outboundShippingMethods = preview.shipping_methods.filter(
       (s) => !!s.actions?.find((a) => a.action === "SHIPPING_ADD" && !a.return_id)
@@ -1470,7 +1493,12 @@ var ExchangeOutboundSection = ({
       );
     }).every(Boolean);
     return !allItemsHaveLocation;
-  }, [outboundItems, inventoryMap, locationId]);
+  }, [
+    outboundItems,
+    inventoryMap,
+    locationId,
+    variantItemMap
+  ]);
   useEffect2(() => {
     const getInventoryMap = async () => {
       const ret = {};
@@ -1495,7 +1523,7 @@ var ExchangeOutboundSection = ({
     /* @__PURE__ */ jsxs4("div", { className: "mt-8 flex items-center justify-between", children: [
       /* @__PURE__ */ jsx8(Heading2, { level: "h2", children: t("orders.returns.outbound") }),
       /* @__PURE__ */ jsxs4(StackedFocusModal, { id: "outbound-items", children: [
-        /* @__PURE__ */ jsx8(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx8("a", { className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
+        /* @__PURE__ */ jsx8(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx8("button", { type: "button", className: "focus-visible:shadow-borders-focus transition-fg txt-compact-small-plus cursor-pointer text-blue-500 outline-none hover:text-blue-400", children: t("actions.addItems") }) }),
         /* @__PURE__ */ jsxs4(StackedFocusModal.Content, { children: [
           /* @__PURE__ */ jsx8(StackedFocusModal.Header, {}),
           /* @__PURE__ */ jsx8(
@@ -1519,6 +1547,7 @@ var ExchangeOutboundSection = ({
             /* @__PURE__ */ jsx8(
               Button2,
               {
+                tabIndex: 0,
                 type: "submit",
                 variant: "primary",
                 size: "small",
@@ -1644,7 +1673,7 @@ var ExchangeCreateForm = ({
     () => preview?.items?.filter(
       (i) => !!i.actions?.find((a) => a.exchange_id === exchange.id)
     ),
-    [preview.items]
+    [preview.items, exchange.id]
   );
   const inboundPreviewItems = previewItems.filter(
     (item) => !!item.actions?.find((a) => a.action === "RETURN_ITEM")
@@ -1761,7 +1790,7 @@ var ExchangeCreateForm = ({
         IS_CANCELING = false;
       }
     };
-  }, []);
+  }, [t, cancelExchangeRequest]);
   const inboundShippingTotal = useMemo6(() => {
     const method = preview.shipping_methods.find(
       (sm) => !!sm.actions?.find((a) => a.action === "SHIPPING_ADD" && !!a.return_id)
@@ -2180,7 +2209,12 @@ var ExchangeCreate = () => {
       }
     }
     run();
-  }, [preview]);
+  }, [
+    preview,
+    createExchange,
+    navigate,
+    t
+  ]);
   return /* @__PURE__ */ jsx10(RouteFocusModal, { "data-testid": "order-create-exchange-modal", children: exchange && preview && order && /* @__PURE__ */ jsx10(
     ExchangeCreateForm,
     {