fix: use /admin/returns/:id/receive for swap returns (#1041)

packages/medusa-react/src/hooks/admin/draft-orders/mutations.ts

@@ -1,4 +1,3 @@
-import { adminDraftOrderKeys } from "./queries"
 import {
   AdminDraftOrdersDeleteRes,
   AdminDraftOrdersRes,
@@ -11,6 +10,7 @@ import { Response } from "@medusajs/medusa-js"
 import { useMutation, UseMutationOptions, useQueryClient } from "react-query"
 import { useMedusa } from "../../../contexts/medusa"
 import { buildOptions } from "../../utils/buildOptions"
+import { adminDraftOrderKeys } from "./queries"
 
 export const useAdminCreateDraftOrder = (
   options?: UseMutationOptions<

packages/medusa-react/src/hooks/admin/returns/mutations.ts

@@ -1,4 +1,8 @@
-import { AdminReturnsCancelRes, AdminReturnsRes } from "@medusajs/medusa"
+import {
+  AdminPostReturnsReturnReceiveReq,
+  AdminReturnsCancelRes,
+  AdminReturnsRes,
+} from "@medusajs/medusa"
 import { Response } from "@medusajs/medusa-js"
 import { useMutation, UseMutationOptions, useQueryClient } from "react-query"
 import { useMedusa } from "../../../contexts/medusa"
@@ -7,13 +11,17 @@ import { adminReturnKeys } from "./queries"
 
 export const useAdminReceiveReturn = (
   id: string,
-  options?: UseMutationOptions<Response<AdminReturnsRes>, Error, void>
+  options?: UseMutationOptions<
+    Response<AdminReturnsRes>,
+    Error,
+    AdminPostReturnsReturnReceiveReq
+  >
 ) => {
   const { client } = useMedusa()
   const queryClient = useQueryClient()
 
   return useMutation(
-    () => client.admin.returns.receive(id),
+    payload => client.admin.returns.receive(id, payload),
     buildOptions(
       queryClient,
       [adminReturnKeys.detail(id), adminReturnKeys.list()],

packages/medusa-react/src/hooks/admin/swaps/mutations.ts

@@ -1,9 +1,7 @@
-import { adminSwapKeys } from "./queries"
 import {
   AdminOrdersRes,
   AdminPostOrdersOrderSwapsReq,
   AdminPostOrdersOrderSwapsSwapFulfillmentsReq,
-  AdminPostOrdersOrderSwapsSwapReceiveReq,
   AdminPostOrdersOrderSwapsSwapShipmentsReq,
 } from "@medusajs/medusa"
 import { Response } from "@medusajs/medusa-js"
@@ -11,6 +9,7 @@ import { useMutation, UseMutationOptions, useQueryClient } from "react-query"
 import { adminOrderKeys } from ".."
 import { useMedusa } from "../../../contexts/medusa"
 import { buildOptions } from "../../utils/buildOptions"
+import { adminSwapKeys } from "./queries"
 
 export const useAdminCreateSwap = (
   orderId: string,
@@ -50,31 +49,6 @@ export const useAdminCancelSwap = (
   )
 }
 
-export const useAdminReceiveSwap = (
-  orderId: string,
-  options?: UseMutationOptions<
-    Response<AdminOrdersRes>,
-    Error,
-    AdminPostOrdersOrderSwapsSwapReceiveReq & { swap_id: string }
-  >
-) => {
-  const { client } = useMedusa()
-  const queryClient = useQueryClient()
-
-  return useMutation(
-    ({
-      swap_id,
-      ...payload
-    }: AdminPostOrdersOrderSwapsSwapReceiveReq & { swap_id: string }) =>
-      client.admin.orders.receiveSwap(orderId, swap_id, payload),
-    buildOptions(
-      queryClient,
-      [adminOrderKeys.detail(orderId), adminSwapKeys.lists()],
-      options
-    )
-  )
-}
-
 export const useAdminFulfillSwap = (
   orderId: string,
   options?: UseMutationOptions<