order-management 0.0.26 → 0.0.28

package/.medusa/server/src/admin/index.js

@@ -18,21 +18,21 @@ const getStatusBadgeClass$3 = (status) => {
   if (statusLower === "requested") {
     return "bg-ui-tag-orange-bg text-ui-tag-orange-text";
   }
-  if (statusLower === "received") {
+  if (statusLower === "approved") {
     return "bg-ui-tag-blue-bg text-ui-tag-blue-text";
   }
-  if (statusLower === "requires_action") {
+  if (statusLower === "rejected") {
     return "bg-ui-tag-red-bg text-ui-tag-red-text";
   }
   if (statusLower === "completed") {
     return "bg-ui-tag-green-bg text-ui-tag-green-text";
   }
-  if (statusLower === "canceled") {
+  if (statusLower === "cancelled") {
     return "bg-ui-tag-grey-bg text-ui-tag-grey-text";
   }
   return "bg-ui-tag-purple-bg text-ui-tag-purple-text";
 };
-const ReturnsPage = () => {
+const SwapsPage = () => {
   const navigate = reactRouterDom.useNavigate();
   const [items, setItems] = react.useState([]);
   const [statusFilter, setStatusFilter] = react.useState("all");
@@ -44,7 +44,7 @@ const ReturnsPage = () => {
   const [offset, setOffset] = react.useState(0);
   const [count, setCount] = react.useState(0);
   const limit = 50;
-  const loadReturns = react.useCallback(
+  const loadSwaps = react.useCallback(
     async (nextOffset, replace = false) => {
       var _a;
       try {
@@ -61,25 +61,24 @@ const ReturnsPage = () => {
           params.set("status", statusFilter);
         }
         if (debouncedSearchQuery.trim()) {
-          params.set("q", debouncedSearchQuery.trim());
+          params.set("order_id", debouncedSearchQuery.trim());
         }
-        params.set("order", "created_at");
         const response = await fetch(
-          `/admin/returns?${params.toString()}`,
+          `/admin/swaps?${params.toString()}`,
           { credentials: "include" }
         );
         if (!response.ok) {
           const message = await response.text();
-          throw new Error(message || "Unable to load return orders");
+          throw new Error(message || "Unable to load swaps");
         }
         const payload = await response.json();
         setCount(payload.count ?? 0);
-        setOffset(nextOffset + (((_a = payload.returns) == null ? void 0 : _a.length) ?? 0));
+        setOffset(nextOffset + (((_a = payload.swaps) == null ? void 0 : _a.length) ?? 0));
         setItems(
-          (prev) => replace ? payload.returns ?? [] : [...prev, ...payload.returns ?? []]
+          (prev) => replace ? payload.swaps ?? [] : [...prev, ...payload.swaps ?? []]
         );
       } catch (loadError) {
-        const message = loadError instanceof Error ? loadError.message : "Unable to load return orders";
+        const message = loadError instanceof Error ? loadError.message : "Unable to load swaps";
         setError(message);
       } finally {
         setIsLoading(false);
@@ -89,8 +88,8 @@ const ReturnsPage = () => {
     [statusFilter, debouncedSearchQuery]
   );
   react.useEffect(() => {
-    void loadReturns(0, true);
-  }, [statusFilter, debouncedSearchQuery, loadReturns]);
+    void loadSwaps(0, true);
+  }, [statusFilter, debouncedSearchQuery, loadSwaps]);
   const hasMore = react.useMemo(() => offset < count, [offset, count]);
   const availableStatuses = react.useMemo(() => {
     const statuses = /* @__PURE__ */ new Set();
@@ -100,16 +99,16 @@ const ReturnsPage = () => {
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "mx-auto flex w-full max-w-7xl flex-col gap-6 p-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { className: "flex flex-col gap-3 md:flex-row md:items-center md:justify-between", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Return Orders" }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "View and manage all customer return orders" })
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Swaps" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "View and manage all customer swap requests" })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "primary", onClick: () => loadReturns(0, true), children: "Refresh" })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "primary", onClick: () => loadSwaps(0, true), children: "Refresh" })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3 md:flex-row md:items-center md:justify-between", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         ui.Input,
         {
-          placeholder: "Search by return ID, order ID, or customer email",
+          placeholder: "Search by swap ID or order ID",
           value: searchQuery,
           onChange: (event) => setSearchQuery(event.target.value),
           className: "md:max-w-sm"
@@ -134,51 +133,50 @@ const ReturnsPage = () => {
         ui.Button,
         {
           variant: "secondary",
-          onClick: () => loadReturns(0, true),
+          onClick: () => loadSwaps(0, true),
           children: "Try again"
         }
       ) })
     ] }) : null,
-    isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading return orders..." }) }) : items.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-dashed border-ui-border-strong p-10 text-center", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h3", className: "text-xl", children: "No return orders yet" }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-subtle", children: "Return orders created by customers will appear here." })
+    isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading swaps..." }) }) : items.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-dashed border-ui-border-strong p-10 text-center", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h3", className: "text-xl", children: "No swaps yet" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-subtle", children: "Swap requests created by customers will appear here." })
     ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
       /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Return ID" }),
+        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Swap ID" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Order ID" }),
-        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Customer" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Status" }),
-        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Refund Amount" }),
+        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Difference Due" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Created" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Actions" })
       ] }) }),
-      /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: items.map((returnOrder) => /* @__PURE__ */ jsxRuntime.jsxs(
+      /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: items.map((swap) => /* @__PURE__ */ jsxRuntime.jsxs(
         "tr",
         {
           className: "hover:bg-ui-bg-subtle/60 cursor-pointer",
-          onClick: () => navigate(`/returns/${returnOrder.id}`),
+          onClick: () => navigate(`/swaps/${swap.id}`),
           children: [
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-0.5", children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: returnOrder.id }) }) }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: returnOrder.order_id }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: returnOrder.customer_email || returnOrder.order_email || "—" }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-0.5", children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: swap.id }) }) }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: swap.order_id }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(
               ui.Badge,
               {
                 size: "2xsmall",
-                className: `uppercase ${getStatusBadgeClass$3(returnOrder.status)}`,
-                children: returnOrder.status.replace(/_/g, " ")
+                className: `uppercase ${getStatusBadgeClass$3(swap.status)}`,
+                children: swap.status.replace(/_/g, " ")
               }
             ) }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: (() => {
-              const amount = returnOrder.refund_amount;
+              const amount = swap.difference_due;
               if (amount == null || amount === void 0) {
                 return "—";
               }
               const displayAmount = Number(amount) / 100;
-              const currency = returnOrder.currency_code || "$";
-              return `${currency}${displayAmount.toFixed(2)}`;
+              const currency = swap.currency_code || "$";
+              const sign = displayAmount >= 0 ? "+" : "";
+              return `${sign}${currency}${displayAmount.toFixed(2)}`;
             })() }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleDateString("en-US", {
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(swap.created_at).toLocaleDateString("en-US", {
               year: "numeric",
               month: "short",
               day: "numeric",
@@ -193,14 +191,14 @@ const ReturnsPage = () => {
                 size: "small",
                 onClick: (e) => {
                   e.stopPropagation();
-                  navigate(`/returns/${returnOrder.id}`);
+                  navigate(`/swaps/${swap.id}`);
                 },
                 children: "View"
               }
             ) })
           ]
         },
-        returnOrder.id
+        swap.id
       )) })
     ] }) }),
     hasMore ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(
@@ -208,14 +206,14 @@ const ReturnsPage = () => {
       {
         variant: "secondary",
         isLoading: isFetchingMore,
-        onClick: () => loadReturns(offset, false),
+        onClick: () => loadSwaps(offset, false),
         children: "Load more"
       }
     ) }) : null
   ] }) });
 };
 const config$3 = adminSdk.defineRouteConfig({
-  label: "Return Orders",
+  label: "Swaps",
   icon: icons.ArrowPath
 });
 const useDebounce = (value, delay) => {
@@ -231,21 +229,21 @@ const getStatusBadgeClass$2 = (status) => {
   if (statusLower === "requested") {
     return "bg-ui-tag-orange-bg text-ui-tag-orange-text";
   }
-  if (statusLower === "approved") {
+  if (statusLower === "received") {
     return "bg-ui-tag-blue-bg text-ui-tag-blue-text";
   }
-  if (statusLower === "rejected") {
+  if (statusLower === "requires_action") {
     return "bg-ui-tag-red-bg text-ui-tag-red-text";
   }
   if (statusLower === "completed") {
     return "bg-ui-tag-green-bg text-ui-tag-green-text";
   }
-  if (statusLower === "cancelled") {
+  if (statusLower === "canceled") {
     return "bg-ui-tag-grey-bg text-ui-tag-grey-text";
   }
   return "bg-ui-tag-purple-bg text-ui-tag-purple-text";
 };
-const SwapsPage = () => {
+const ReturnsPage = () => {
   const navigate = reactRouterDom.useNavigate();
   const [items, setItems] = react.useState([]);
   const [statusFilter, setStatusFilter] = react.useState("all");
@@ -257,7 +255,7 @@ const SwapsPage = () => {
   const [offset, setOffset] = react.useState(0);
   const [count, setCount] = react.useState(0);
   const limit = 50;
-  const loadSwaps = react.useCallback(
+  const loadReturns = react.useCallback(
     async (nextOffset, replace = false) => {
       var _a;
       try {
@@ -274,24 +272,25 @@ const SwapsPage = () => {
           params.set("status", statusFilter);
         }
         if (debouncedSearchQuery.trim()) {
-          params.set("order_id", debouncedSearchQuery.trim());
+          params.set("q", debouncedSearchQuery.trim());
         }
+        params.set("order", "created_at");
         const response = await fetch(
-          `/admin/swaps?${params.toString()}`,
+          `/admin/returns?${params.toString()}`,
           { credentials: "include" }
         );
         if (!response.ok) {
           const message = await response.text();
-          throw new Error(message || "Unable to load swaps");
+          throw new Error(message || "Unable to load return orders");
         }
         const payload = await response.json();
         setCount(payload.count ?? 0);
-        setOffset(nextOffset + (((_a = payload.swaps) == null ? void 0 : _a.length) ?? 0));
+        setOffset(nextOffset + (((_a = payload.returns) == null ? void 0 : _a.length) ?? 0));
         setItems(
-          (prev) => replace ? payload.swaps ?? [] : [...prev, ...payload.swaps ?? []]
+          (prev) => replace ? payload.returns ?? [] : [...prev, ...payload.returns ?? []]
         );
       } catch (loadError) {
-        const message = loadError instanceof Error ? loadError.message : "Unable to load swaps";
+        const message = loadError instanceof Error ? loadError.message : "Unable to load return orders";
         setError(message);
       } finally {
         setIsLoading(false);
@@ -301,8 +300,8 @@ const SwapsPage = () => {
     [statusFilter, debouncedSearchQuery]
   );
   react.useEffect(() => {
-    void loadSwaps(0, true);
-  }, [statusFilter, debouncedSearchQuery, loadSwaps]);
+    void loadReturns(0, true);
+  }, [statusFilter, debouncedSearchQuery, loadReturns]);
   const hasMore = react.useMemo(() => offset < count, [offset, count]);
   const availableStatuses = react.useMemo(() => {
     const statuses = /* @__PURE__ */ new Set();
@@ -312,16 +311,16 @@ const SwapsPage = () => {
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "mx-auto flex w-full max-w-7xl flex-col gap-6 p-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { className: "flex flex-col gap-3 md:flex-row md:items-center md:justify-between", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Swaps" }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "View and manage all customer swap requests" })
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Return Orders" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "View and manage all customer return orders" })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "primary", onClick: () => loadSwaps(0, true), children: "Refresh" })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "primary", onClick: () => loadReturns(0, true), children: "Refresh" })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3 md:flex-row md:items-center md:justify-between", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         ui.Input,
         {
-          placeholder: "Search by swap ID or order ID",
+          placeholder: "Search by return ID, order ID, or customer email",
           value: searchQuery,
           onChange: (event) => setSearchQuery(event.target.value),
           className: "md:max-w-sm"
@@ -346,50 +345,51 @@ const SwapsPage = () => {
         ui.Button,
         {
           variant: "secondary",
-          onClick: () => loadSwaps(0, true),
+          onClick: () => loadReturns(0, true),
           children: "Try again"
         }
       ) })
     ] }) : null,
-    isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading swaps..." }) }) : items.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-dashed border-ui-border-strong p-10 text-center", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h3", className: "text-xl", children: "No swaps yet" }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-subtle", children: "Swap requests created by customers will appear here." })
+    isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading return orders..." }) }) : items.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-dashed border-ui-border-strong p-10 text-center", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h3", className: "text-xl", children: "No return orders yet" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-subtle", children: "Return orders created by customers will appear here." })
     ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
       /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Swap ID" }),
+        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Return ID" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Order ID" }),
+        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Customer" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Status" }),
-        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Difference Due" }),
+        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Refund Amount" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Created" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Actions" })
       ] }) }),
-      /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: items.map((swap) => /* @__PURE__ */ jsxRuntime.jsxs(
+      /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: items.map((returnOrder) => /* @__PURE__ */ jsxRuntime.jsxs(
         "tr",
         {
           className: "hover:bg-ui-bg-subtle/60 cursor-pointer",
-          onClick: () => navigate(`/swaps/${swap.id}`),
+          onClick: () => navigate(`/returns/${returnOrder.id}`),
           children: [
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-0.5", children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: swap.id }) }) }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: swap.order_id }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-0.5", children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: returnOrder.id }) }) }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: returnOrder.order_id }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: returnOrder.customer_email || returnOrder.order_email || "—" }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(
               ui.Badge,
               {
                 size: "2xsmall",
-                className: `uppercase ${getStatusBadgeClass$2(swap.status)}`,
-                children: swap.status.replace(/_/g, " ")
+                className: `uppercase ${getStatusBadgeClass$2(returnOrder.status)}`,
+                children: returnOrder.status.replace(/_/g, " ")
               }
             ) }),
             /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: (() => {
-              const amount = swap.difference_due;
+              const amount = returnOrder.refund_amount;
               if (amount == null || amount === void 0) {
                 return "—";
               }
               const displayAmount = Number(amount) / 100;
-              const currency = swap.currency_code || "$";
-              const sign = displayAmount >= 0 ? "+" : "";
-              return `${sign}${currency}${displayAmount.toFixed(2)}`;
+              const currency = returnOrder.currency_code || "$";
+              return `${currency}${displayAmount.toFixed(2)}`;
             })() }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(swap.created_at).toLocaleDateString("en-US", {
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleDateString("en-US", {
               year: "numeric",
               month: "short",
               day: "numeric",
@@ -404,14 +404,14 @@ const SwapsPage = () => {
                 size: "small",
                 onClick: (e) => {
                   e.stopPropagation();
-                  navigate(`/swaps/${swap.id}`);
+                  navigate(`/returns/${returnOrder.id}`);
                 },
                 children: "View"
               }
             ) })
           ]
         },
-        swap.id
+        returnOrder.id
       )) })
     ] }) }),
     hasMore ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(
@@ -419,14 +419,14 @@ const SwapsPage = () => {
       {
         variant: "secondary",
         isLoading: isFetchingMore,
-        onClick: () => loadSwaps(offset, false),
+        onClick: () => loadReturns(offset, false),
         children: "Load more"
       }
     ) }) : null
   ] }) });
 };
 const config$2 = adminSdk.defineRouteConfig({
-  label: "Swaps",
+  label: "Return Orders",
   icon: icons.ArrowPath
 });
 const getStatusBadgeClass$1 = (status) => {
@@ -434,65 +434,63 @@ const getStatusBadgeClass$1 = (status) => {
   if (statusLower === "requested") {
     return "bg-ui-tag-orange-bg text-ui-tag-orange-text";
   }
-  if (statusLower === "received") {
+  if (statusLower === "approved") {
     return "bg-ui-tag-blue-bg text-ui-tag-blue-text";
   }
-  if (statusLower === "requires_action") {
+  if (statusLower === "rejected") {
     return "bg-ui-tag-red-bg text-ui-tag-red-text";
   }
   if (statusLower === "completed") {
     return "bg-ui-tag-green-bg text-ui-tag-green-text";
   }
-  if (statusLower === "canceled") {
+  if (statusLower === "cancelled") {
     return "bg-ui-tag-grey-bg text-ui-tag-grey-text";
   }
   return "bg-ui-tag-purple-bg text-ui-tag-purple-text";
 };
-const ReturnDetailPage = () => {
-  var _a, _b, _c;
+const SwapDetailPage = () => {
+  var _a, _b;
   const navigate = reactRouterDom.useNavigate();
   const { id } = reactRouterDom.useParams();
-  const [returnOrder, setReturnOrder] = react.useState(null);
+  const [swap, setSwap] = react.useState(null);
+  const [order, setOrder] = react.useState(null);
   const [selectedStatus, setSelectedStatus] = react.useState("");
   const [isLoading, setIsLoading] = react.useState(true);
   const [isUpdating, setIsUpdating] = react.useState(false);
+  const [isApproving, setIsApproving] = react.useState(false);
+  const [isRejecting, setIsRejecting] = react.useState(false);
   const [error, setError] = react.useState(null);
   const [updateError, setUpdateError] = react.useState(null);
   const [updateSuccess, setUpdateSuccess] = react.useState(false);
-  const availableStatuses = [
-    "requested",
-    "received",
-    "requires_action",
-    "completed",
-    "canceled"
-  ];
+  const availableStatuses = ["requested", "approved", "rejected"];
   react.useEffect(() => {
     if (!id) {
-      navigate("/returns");
+      navigate("/swaps");
       return;
     }
-    const loadReturn = async () => {
+    const loadSwap = async () => {
       try {
         setIsLoading(true);
         setError(null);
-        const response = await fetch(`/admin/returns/${id}`, {
+        const response = await fetch(`/admin/swaps/${id}`, {
           credentials: "include"
         });
         if (!response.ok) {
           const message = await response.text();
-          throw new Error(message || "Unable to load return order");
+          throw new Error(message || "Unable to load swap");
         }
         const payload = await response.json();
-        setReturnOrder(payload.return);
+        setSwap(payload.swap);
+        setOrder(payload.order || null);
         setSelectedStatus("");
       } catch (loadError) {
-        const message = loadError instanceof Error ? loadError.message : "Unable to load return order";
+        const message = loadError instanceof Error ? loadError.message : "Unable to load swap";
         setError(message);
       } finally {
         setIsLoading(false);
       }
     };
-    void loadReturn();
+    void loadSwap();
   }, [id, navigate]);
   const handleStatusUpdate = async () => {
     if (!id || !selectedStatus) {
@@ -502,7 +500,7 @@ const ReturnDetailPage = () => {
       setIsUpdating(true);
       setUpdateError(null);
       setUpdateSuccess(false);
-      const response = await fetch(`/admin/returns/${id}/status`, {
+      const response = await fetch(`/admin/swaps/${id}/status`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
@@ -515,16 +513,17 @@ const ReturnDetailPage = () => {
         throw new Error(message || "Unable to update status");
       }
       const payload = await response.json();
-      setReturnOrder(payload.return);
+      setSwap(payload.swap);
       setSelectedStatus("");
       setUpdateSuccess(true);
       setTimeout(() => setUpdateSuccess(false), 3e3);
-      const detailResponse = await fetch(`/admin/returns/${id}`, {
+      const detailResponse = await fetch(`/admin/swaps/${id}`, {
         credentials: "include"
       });
       if (detailResponse.ok) {
         const detailPayload = await detailResponse.json();
-        setReturnOrder(detailPayload.return);
+        setSwap(detailPayload.swap);
+        setOrder(detailPayload.order || null);
       }
     } catch (updateErr) {
       const message = updateErr instanceof Error ? updateErr.message : "Unable to update status";
@@ -533,16 +532,65 @@ const ReturnDetailPage = () => {
       setIsUpdating(false);
     }
   };
+  const handleApproveClick = async () => {
+    if (!id) {
+      return;
+    }
+    if (!swap || !swap.order_id) {
+      setUpdateError("Swap must have an order_id to create exchange");
+      return;
+    }
+    window.location.href = `/app/orders/${swap.order_id}/exchanges`;
+  };
+  const handleReject = async () => {
+    if (!id) {
+      return;
+    }
+    try {
+      setIsRejecting(true);
+      setUpdateError(null);
+      setUpdateSuccess(false);
+      const response = await fetch(`/admin/swaps/${id}/reject`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        credentials: "include",
+        body: JSON.stringify({ reason: "Rejected by admin" })
+      });
+      if (!response.ok) {
+        const message = await response.text();
+        throw new Error(message || "Unable to reject swap");
+      }
+      const payload = await response.json();
+      setSwap(payload.swap);
+      setUpdateSuccess(true);
+      setTimeout(() => setUpdateSuccess(false), 3e3);
+      const detailResponse = await fetch(`/admin/swaps/${id}`, {
+        credentials: "include"
+      });
+      if (detailResponse.ok) {
+        const detailPayload = await response.json();
+        setSwap(detailPayload.swap);
+        setOrder(detailPayload.order || null);
+      }
+    } catch (updateErr) {
+      const message = updateErr instanceof Error ? updateErr.message : "Unable to reject swap";
+      setUpdateError(message);
+    } finally {
+      setIsRejecting(false);
+    }
+  };
   if (isLoading) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading return order..." }) }) }) });
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading swap..." }) }) }) });
   }
-  if (error || !returnOrder) {
+  if (error || !swap) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-strong p-6 text-center", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-error", children: error || "Return order not found" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-4 flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "secondary", onClick: () => navigate("/returns"), children: "Back to list" }) })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-error", children: error || "Swap not found" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-4 flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "secondary", onClick: () => navigate("/swaps"), children: "Back to list" }) })
     ] }) }) });
   }
-  const statusHistory = ((_a = returnOrder.metadata) == null ? void 0 : _a.status_history) || [];
+  const statusHistory = ((_a = swap.metadata) == null ? void 0 : _a.status_history) || [];
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { className: "flex flex-col gap-3", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(
@@ -550,7 +598,7 @@ const ReturnDetailPage = () => {
         {
           variant: "transparent",
           size: "small",
-          onClick: () => navigate("/returns"),
+          onClick: () => navigate("/swaps"),
           className: "w-fit",
           children: [
             /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowLeft, { className: "mr-2" }),
@@ -560,20 +608,42 @@ const ReturnDetailPage = () => {
       ),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1 md:flex-row md:items-center md:justify-between", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Return Order Details" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: returnOrder.id })
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Swap Details" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: swap.id })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(
           ui.Badge,
           {
             size: "small",
-            className: `uppercase ${getStatusBadgeClass$1(returnOrder.status)}`,
-            children: returnOrder.status.replace("_", " ")
+            className: `uppercase ${getStatusBadgeClass$1(swap.status)}`,
+            children: swap.status.replace(/_/g, " ")
           }
         )
       ] })
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    swap.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(
+        ui.Button,
+        {
+          variant: "primary",
+          onClick: handleApproveClick,
+          disabled: isApproving || isRejecting,
+          isLoading: isApproving,
+          children: "Approve Swap"
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        ui.Button,
+        {
+          variant: "secondary",
+          onClick: handleReject,
+          disabled: isApproving || isRejecting,
+          isLoading: isRejecting,
+          children: "Reject Swap"
+        }
+      )
+    ] }),
+    swap.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Update Status" }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3 md:flex-row md:items-end", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1", children: [
@@ -586,7 +656,7 @@ const ReturnDetailPage = () => {
               className: "h-9 w-full rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive",
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx("option", { value: "", children: "Select new status" }),
-                availableStatuses.filter((status) => status !== returnOrder.status).map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace("_", " ").toUpperCase() }, status))
+                availableStatuses.filter((status) => status !== swap.status).map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
               ]
             }
           )
@@ -605,37 +675,60 @@ const ReturnDetailPage = () => {
       updateError && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-error", children: updateError }),
       updateSuccess && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-success", children: "Status updated successfully" })
     ] }),
+    swap.status === "approved" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Exchange Information" }),
+      swap.exchange_id ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange ID" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.exchange_id })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Button,
+          {
+            variant: "secondary",
+            onClick: () => {
+              window.open(`/app/orders/${swap.order_id}/exchanges/${swap.exchange_id}`, "_blank");
+            },
+            children: "View Exchange"
+          }
+        ) })
+      ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-3", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange is being created. Please refresh the page to see the exchange details." }) })
+    ] }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid gap-6 md:grid-cols-2", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Information" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Swap Information" }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Return ID" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.id })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Swap ID" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.id })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Status" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.status })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.status })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Refund Amount" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.refund_amount ? `${((_b = returnOrder.order) == null ? void 0 : _b.currency_code) || "$"}${Number(returnOrder.refund_amount).toFixed(2)}` : "—" })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Difference Due" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.difference_due != null ? `${swap.currency_code || "$"}${(Number(swap.difference_due) / 100).toFixed(2)}` : "—" })
           ] }),
-          returnOrder.reason && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          swap.reason && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Reason" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.reason })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.reason })
           ] }),
-          returnOrder.note && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          swap.note && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Note" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.note })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.note })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Created" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(returnOrder.created_at).toLocaleString() })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(swap.created_at).toLocaleString() })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Last Updated" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(returnOrder.updated_at).toLocaleString() })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(swap.updated_at).toLocaleString() })
+          ] }),
+          swap.exchange_id && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange ID" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.exchange_id })
           ] })
         ] })
       ] }),
@@ -646,23 +739,18 @@ const ReturnDetailPage = () => {
           {
             className: "flex items-center justify-between border-b border-ui-border-subtle pb-2 last:border-0",
             children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-              /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  ui.Badge,
-                  {
-                    size: "2xsmall",
-                    className: `uppercase ${getStatusBadgeClass$1(entry.to)}`,
-                    children: entry.to.replace("_", " ")
-                  }
-                ),
-                entry.from && /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: [
-                  "from ",
-                  entry.from.replace("_", " ")
-                ] })
-              ] }),
+              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsxRuntime.jsx(
+                ui.Badge,
+                {
+                  size: "2xsmall",
+                  className: `uppercase ${getStatusBadgeClass$1(entry.status)}`,
+                  children: entry.status.replace(/_/g, " ")
+                }
+              ) }),
               /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: [
-                new Date(entry.changed_at).toLocaleString(),
-                entry.changed_by && ` by ${entry.changed_by}`
+                new Date(entry.timestamp).toLocaleString(),
+                entry.admin_id && ` by ${entry.admin_id}`,
+                entry.reason && ` - ${entry.reason}`
               ] })
             ] })
           },
@@ -670,76 +758,62 @@ const ReturnDetailPage = () => {
         )) }) : /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "No status history available" })
       ] })
     ] }),
-    returnOrder.order && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    order && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Related Order Information" }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid gap-6 md:grid-cols-2", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order ID" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.id })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Status" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.status || "—" })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Customer" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: ((_c = returnOrder.order.customer) == null ? void 0 : _c.email) || returnOrder.order.email || "—" })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Total" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.total ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.total).toFixed(2)}` : "—" })
-          ] })
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order ID" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: order.id })
         ] }),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Subtotal" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.subtotal ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.subtotal).toFixed(2)}` : "—" })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Tax Total" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.tax_total ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.tax_total).toFixed(2)}` : "—" })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Shipping Total" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.shipping_total ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.shipping_total).toFixed(2)}` : "—" })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Created" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.created_at ? new Date(returnOrder.order.created_at).toLocaleString() : "—" })
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Status" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: order.status || "—" })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Customer" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: ((_b = order.customer) == null ? void 0 : _b.email) || order.email || "—" })
+        ] }),
+        order.total && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Total" }),
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { className: "font-medium", children: [
+            order.currency_code || "$",
+            (Number(order.total) / 100).toFixed(2)
           ] })
         ] })
       ] })
     ] }),
-    returnOrder.items && returnOrder.items.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    swap.return_items && swap.return_items.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Items" }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
         /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Item" }),
-          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Quantity" })
+          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Item ID" }),
+          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Quantity" }),
+          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Reason" })
         ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: returnOrder.items.map((item) => {
-          var _a2, _b2;
-          return /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: ((_a2 = item.item) == null ? void 0 : _a2.title) || ((_b2 = item.item) == null ? void 0 : _b2.id) || item.id }),
-            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.quantity })
-          ] }, item.id);
-        }) })
+        /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: swap.return_items.map((item, index) => /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: item.id }),
+          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.quantity }),
+          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.reason || "—" })
+        ] }, item.id || index)) })
       ] }) })
     ] }),
-    returnOrder.metadata && Object.keys(returnOrder.metadata).filter(
-      (key) => key !== "status_history"
-    ).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Metadata" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-2", children: Object.entries(returnOrder.metadata).filter(([key]) => key !== "status_history").map(([key, value]) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-between", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: key }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "font-medium", children: typeof value === "string" ? value : JSON.stringify(value) })
-      ] }, key)) })
+    swap.new_items && swap.new_items.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "New Items" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Variant ID" }),
+          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Quantity" })
+        ] }) }),
+        /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: swap.new_items.map((item, index) => /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: item.variant_id }),
+          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.quantity })
+        ] }, item.variant_id || index)) })
+      ] }) })
     ] })
   ] }) });
 };
 const config$1 = adminSdk.defineRouteConfig({
-  label: "Return Order Details",
+  label: "Swap Details",
   icon: icons.ArrowPath
 });
 const getStatusBadgeClass = (status) => {
@@ -747,63 +821,65 @@ const getStatusBadgeClass = (status) => {
   if (statusLower === "requested") {
     return "bg-ui-tag-orange-bg text-ui-tag-orange-text";
   }
-  if (statusLower === "approved") {
+  if (statusLower === "received") {
     return "bg-ui-tag-blue-bg text-ui-tag-blue-text";
   }
-  if (statusLower === "rejected") {
+  if (statusLower === "requires_action") {
     return "bg-ui-tag-red-bg text-ui-tag-red-text";
   }
   if (statusLower === "completed") {
     return "bg-ui-tag-green-bg text-ui-tag-green-text";
   }
-  if (statusLower === "cancelled") {
+  if (statusLower === "canceled") {
     return "bg-ui-tag-grey-bg text-ui-tag-grey-text";
   }
   return "bg-ui-tag-purple-bg text-ui-tag-purple-text";
 };
-const SwapDetailPage = () => {
-  var _a, _b;
+const ReturnDetailPage = () => {
+  var _a, _b, _c;
   const navigate = reactRouterDom.useNavigate();
   const { id } = reactRouterDom.useParams();
-  const [swap, setSwap] = react.useState(null);
-  const [order, setOrder] = react.useState(null);
+  const [returnOrder, setReturnOrder] = react.useState(null);
   const [selectedStatus, setSelectedStatus] = react.useState("");
   const [isLoading, setIsLoading] = react.useState(true);
   const [isUpdating, setIsUpdating] = react.useState(false);
-  const [isApproving, setIsApproving] = react.useState(false);
-  const [isRejecting, setIsRejecting] = react.useState(false);
   const [error, setError] = react.useState(null);
   const [updateError, setUpdateError] = react.useState(null);
   const [updateSuccess, setUpdateSuccess] = react.useState(false);
-  const availableStatuses = ["requested", "approved", "rejected"];
+  const availableStatuses = [
+    "requested",
+    "received",
+    "requires_action",
+    "completed",
+    "canceled"
+  ];
   react.useEffect(() => {
     if (!id) {
-      navigate("/swaps");
+      navigate("/returns");
       return;
     }
-    const loadSwap = async () => {
+    const loadReturn = async () => {
       try {
         setIsLoading(true);
         setError(null);
-        const response = await fetch(`/admin/swaps/${id}`, {
+        const response = await fetch(`/admin/returns/${id}`, {
           credentials: "include"
         });
         if (!response.ok) {
           const message = await response.text();
-          throw new Error(message || "Unable to load swap");
+          throw new Error(message || "Unable to load return order");
         }
         const payload = await response.json();
-        setSwap(payload.swap);
-        setOrder(payload.order || null);
+        setReturnOrder(payload.return);
         setSelectedStatus("");
       } catch (loadError) {
-        const message = loadError instanceof Error ? loadError.message : "Unable to load swap";
+        const message = loadError instanceof Error ? loadError.message : "Unable to load return order";
         setError(message);
       } finally {
         setIsLoading(false);
       }
     };
-    void loadSwap();
+    void loadReturn();
   }, [id, navigate]);
   const handleStatusUpdate = async () => {
     if (!id || !selectedStatus) {
@@ -813,7 +889,7 @@ const SwapDetailPage = () => {
       setIsUpdating(true);
       setUpdateError(null);
       setUpdateSuccess(false);
-      const response = await fetch(`/admin/swaps/${id}/status`, {
+      const response = await fetch(`/admin/returns/${id}/status`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
@@ -826,17 +902,16 @@ const SwapDetailPage = () => {
         throw new Error(message || "Unable to update status");
       }
       const payload = await response.json();
-      setSwap(payload.swap);
+      setReturnOrder(payload.return);
       setSelectedStatus("");
       setUpdateSuccess(true);
       setTimeout(() => setUpdateSuccess(false), 3e3);
-      const detailResponse = await fetch(`/admin/swaps/${id}`, {
+      const detailResponse = await fetch(`/admin/returns/${id}`, {
         credentials: "include"
       });
       if (detailResponse.ok) {
         const detailPayload = await detailResponse.json();
-        setSwap(detailPayload.swap);
-        setOrder(detailPayload.order || null);
+        setReturnOrder(detailPayload.return);
       }
     } catch (updateErr) {
       const message = updateErr instanceof Error ? updateErr.message : "Unable to update status";
@@ -845,90 +920,16 @@ const SwapDetailPage = () => {
       setIsUpdating(false);
     }
   };
-  const handleApproveClick = async () => {
-    if (!id) {
-      return;
-    }
-    if (!swap || !swap.order_id) {
-      setUpdateError("Swap must have an order_id to create exchange");
-      return;
-    }
-    try {
-      setIsApproving(true);
-      setUpdateError(null);
-      setUpdateSuccess(false);
-      const response = await fetch(`/admin/swaps/${id}/prepare-exchange`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        credentials: "include"
-      });
-      if (!response.ok) {
-        const errorData = await response.json().catch(() => ({ message: "Unable to prepare swap for exchange creation" }));
-        throw new Error(errorData.message || errorData.error || "Unable to prepare swap for exchange creation");
-      }
-      const payload = await response.json();
-      setSwap(payload.swap);
-      setUpdateSuccess(true);
-      setTimeout(() => setUpdateSuccess(false), 3e3);
-      window.location.href = `/app/orders/${swap.order_id}`;
-    } catch (updateErr) {
-      const message = updateErr instanceof Error ? updateErr.message : "Unable to prepare swap for exchange creation";
-      setUpdateError(message);
-    } finally {
-      setIsApproving(false);
-    }
-  };
-  const handleReject = async () => {
-    if (!id) {
-      return;
-    }
-    try {
-      setIsRejecting(true);
-      setUpdateError(null);
-      setUpdateSuccess(false);
-      const response = await fetch(`/admin/swaps/${id}/reject`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        credentials: "include",
-        body: JSON.stringify({ reason: "Rejected by admin" })
-      });
-      if (!response.ok) {
-        const message = await response.text();
-        throw new Error(message || "Unable to reject swap");
-      }
-      const payload = await response.json();
-      setSwap(payload.swap);
-      setUpdateSuccess(true);
-      setTimeout(() => setUpdateSuccess(false), 3e3);
-      const detailResponse = await fetch(`/admin/swaps/${id}`, {
-        credentials: "include"
-      });
-      if (detailResponse.ok) {
-        const detailPayload = await response.json();
-        setSwap(detailPayload.swap);
-        setOrder(detailPayload.order || null);
-      }
-    } catch (updateErr) {
-      const message = updateErr instanceof Error ? updateErr.message : "Unable to reject swap";
-      setUpdateError(message);
-    } finally {
-      setIsRejecting(false);
-    }
-  };
   if (isLoading) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading swap..." }) }) }) });
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading return order..." }) }) }) });
   }
-  if (error || !swap) {
+  if (error || !returnOrder) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-strong p-6 text-center", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-error", children: error || "Swap not found" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-4 flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "secondary", onClick: () => navigate("/swaps"), children: "Back to list" }) })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-error", children: error || "Return order not found" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-4 flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "secondary", onClick: () => navigate("/returns"), children: "Back to list" }) })
     ] }) }) });
   }
-  const statusHistory = ((_a = swap.metadata) == null ? void 0 : _a.status_history) || [];
+  const statusHistory = ((_a = returnOrder.metadata) == null ? void 0 : _a.status_history) || [];
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { className: "flex flex-col gap-3", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(
@@ -936,7 +937,7 @@ const SwapDetailPage = () => {
         {
           variant: "transparent",
           size: "small",
-          onClick: () => navigate("/swaps"),
+          onClick: () => navigate("/returns"),
           className: "w-fit",
           children: [
             /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowLeft, { className: "mr-2" }),
@@ -946,42 +947,20 @@ const SwapDetailPage = () => {
       ),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1 md:flex-row md:items-center md:justify-between", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Swap Details" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: swap.id })
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Return Order Details" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: returnOrder.id })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(
           ui.Badge,
           {
             size: "small",
-            className: `uppercase ${getStatusBadgeClass(swap.status)}`,
-            children: swap.status.replace(/_/g, " ")
+            className: `uppercase ${getStatusBadgeClass(returnOrder.status)}`,
+            children: returnOrder.status.replace("_", " ")
           }
         )
       ] })
     ] }),
-    swap.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(
-        ui.Button,
-        {
-          variant: "primary",
-          onClick: handleApproveClick,
-          disabled: isApproving || isRejecting,
-          isLoading: isApproving,
-          children: "Approve Swap"
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        ui.Button,
-        {
-          variant: "secondary",
-          onClick: handleReject,
-          disabled: isApproving || isRejecting,
-          isLoading: isRejecting,
-          children: "Reject Swap"
-        }
-      )
-    ] }),
-    swap.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Update Status" }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3 md:flex-row md:items-end", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1", children: [
@@ -994,7 +973,7 @@ const SwapDetailPage = () => {
               className: "h-9 w-full rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive",
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx("option", { value: "", children: "Select new status" }),
-                availableStatuses.filter((status) => status !== swap.status).map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
+                availableStatuses.filter((status) => status !== returnOrder.status).map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace("_", " ").toUpperCase() }, status))
               ]
             }
           )
@@ -1013,60 +992,37 @@ const SwapDetailPage = () => {
       updateError && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-error", children: updateError }),
       updateSuccess && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-success", children: "Status updated successfully" })
     ] }),
-    swap.status === "approved" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Exchange Information" }),
-      swap.exchange_id ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange ID" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.exchange_id })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "secondary",
-            onClick: () => {
-              window.open(`/app/orders/${swap.order_id}/exchanges/${swap.exchange_id}`, "_blank");
-            },
-            children: "View Exchange"
-          }
-        ) })
-      ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-3", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange is being created. Please refresh the page to see the exchange details." }) })
-    ] }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid gap-6 md:grid-cols-2", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Swap Information" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Information" }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Swap ID" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.id })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Return ID" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.id })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Status" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.status })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.status })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Difference Due" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.difference_due != null ? `${swap.currency_code || "$"}${(Number(swap.difference_due) / 100).toFixed(2)}` : "—" })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Refund Amount" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.refund_amount ? `${((_b = returnOrder.order) == null ? void 0 : _b.currency_code) || "$"}${Number(returnOrder.refund_amount).toFixed(2)}` : "—" })
           ] }),
-          swap.reason && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          returnOrder.reason && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Reason" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.reason })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.reason })
           ] }),
-          swap.note && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          returnOrder.note && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Note" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.note })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.note })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Created" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(swap.created_at).toLocaleString() })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(returnOrder.created_at).toLocaleString() })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Last Updated" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(swap.updated_at).toLocaleString() })
-          ] }),
-          swap.exchange_id && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange ID" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.exchange_id })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: new Date(returnOrder.updated_at).toLocaleString() })
           ] })
         ] })
       ] }),
@@ -1077,18 +1033,23 @@ const SwapDetailPage = () => {
           {
             className: "flex items-center justify-between border-b border-ui-border-subtle pb-2 last:border-0",
             children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsxRuntime.jsx(
-                ui.Badge,
-                {
-                  size: "2xsmall",
-                  className: `uppercase ${getStatusBadgeClass(entry.status)}`,
-                  children: entry.status.replace(/_/g, " ")
-                }
-              ) }),
+              /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  ui.Badge,
+                  {
+                    size: "2xsmall",
+                    className: `uppercase ${getStatusBadgeClass(entry.to)}`,
+                    children: entry.to.replace("_", " ")
+                  }
+                ),
+                entry.from && /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: [
+                  "from ",
+                  entry.from.replace("_", " ")
+                ] })
+              ] }),
               /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: [
-                new Date(entry.timestamp).toLocaleString(),
-                entry.admin_id && ` by ${entry.admin_id}`,
-                entry.reason && ` - ${entry.reason}`
+                new Date(entry.changed_at).toLocaleString(),
+                entry.changed_by && ` by ${entry.changed_by}`
               ] })
             ] })
           },
@@ -1096,83 +1057,97 @@ const SwapDetailPage = () => {
         )) }) : /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "No status history available" })
       ] })
     ] }),
-    order && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    returnOrder.order && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Related Order Information" }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order ID" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: order.id })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Status" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: order.status || "—" })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Customer" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: ((_b = order.customer) == null ? void 0 : _b.email) || order.email || "—" })
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid gap-6 md:grid-cols-2", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order ID" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.id })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Status" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.status || "—" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Customer" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: ((_c = returnOrder.order.customer) == null ? void 0 : _c.email) || returnOrder.order.email || "—" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Total" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.total ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.total).toFixed(2)}` : "—" })
+          ] })
         ] }),
-        order.total && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Total" }),
-          /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { className: "font-medium", children: [
-            order.currency_code || "$",
-            (Number(order.total) / 100).toFixed(2)
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Subtotal" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.subtotal ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.subtotal).toFixed(2)}` : "—" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Tax Total" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.tax_total ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.tax_total).toFixed(2)}` : "—" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Shipping Total" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.shipping_total ? `${returnOrder.order.currency_code || "$"}${Number(returnOrder.order.shipping_total).toFixed(2)}` : "—" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Created" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.order.created_at ? new Date(returnOrder.order.created_at).toLocaleString() : "—" })
           ] })
         ] })
       ] })
     ] }),
-    swap.return_items && swap.return_items.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    returnOrder.items && returnOrder.items.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Items" }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
         /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Item ID" }),
-          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Quantity" }),
-          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Reason" })
-        ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: swap.return_items.map((item, index) => /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: item.id }),
-          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.quantity }),
-          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.reason || "—" })
-        ] }, item.id || index)) })
-      ] }) })
-    ] }),
-    swap.new_items && swap.new_items.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "New Items" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Variant ID" }),
+          /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Item" }),
           /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Quantity" })
         ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: swap.new_items.map((item, index) => /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: item.variant_id }),
-          /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.quantity })
-        ] }, item.variant_id || index)) })
+        /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-ui-border-subtle", children: returnOrder.items.map((item) => {
+          var _a2, _b2;
+          return /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 font-medium text-ui-fg-base", children: ((_a2 = item.item) == null ? void 0 : _a2.title) || ((_b2 = item.item) == null ? void 0 : _b2.id) || item.id }),
+            /* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: item.quantity })
+          ] }, item.id);
+        }) })
       ] }) })
+    ] }),
+    returnOrder.metadata && Object.keys(returnOrder.metadata).filter(
+      (key) => key !== "status_history"
+    ).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Metadata" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-2", children: Object.entries(returnOrder.metadata).filter(([key]) => key !== "status_history").map(([key, value]) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-between", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: key }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "font-medium", children: typeof value === "string" ? value : JSON.stringify(value) })
+      ] }, key)) })
     ] })
   ] }) });
 };
 const config = adminSdk.defineRouteConfig({
-  label: "Swap Details",
+  label: "Return Order Details",
   icon: icons.ArrowPath
 });
 const i18nTranslations0 = {};
 const widgetModule = { widgets: [] };
 const routeModule = {
   routes: [
-    {
-      Component: ReturnsPage,
-      path: "/returns"
-    },
     {
       Component: SwapsPage,
       path: "/swaps"
     },
     {
-      Component: ReturnDetailPage,
-      path: "/returns/:id"
+      Component: ReturnsPage,
+      path: "/returns"
     },
     {
       Component: SwapDetailPage,
       path: "/swaps/:id"
+    },
+    {
+      Component: ReturnDetailPage,
+      path: "/returns/:id"
     }
   ]
 };
@@ -1181,25 +1156,25 @@ const menuItemModule = {
     {
       label: config$2.label,
       icon: config$2.icon,
-      path: "/swaps",
+      path: "/returns",
       nested: void 0
     },
     {
       label: config$3.label,
       icon: config$3.icon,
-      path: "/returns",
+      path: "/swaps",
       nested: void 0
     },
     {
       label: config.label,
       icon: config.icon,
-      path: "/swaps/:id",
+      path: "/returns/:id",
       nested: void 0
     },
     {
       label: config$1.label,
       icon: config$1.icon,
-      path: "/returns/:id",
+      path: "/swaps/:id",
       nested: void 0
     }
   ]