fix: Merge conflicts with master

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

@@ -4,9 +4,8 @@ import {
   AdminPostUploadsDownloadUrlReq,
   AdminUploadsDownloadUrlRes,
   AdminUploadsRes,
-  IAdminPostUploadsFileReq,
 } from "@medusajs/medusa"
-import { Response } from "@medusajs/medusa-js"
+import { AdminCreateUploadPayload, Response } from "@medusajs/medusa-js"
 import {
   useMutation,
   UseMutationOptions,
@@ -19,13 +18,13 @@ export const useAdminUploadFile = (
   options?: UseMutationOptions<
     Response<AdminUploadsRes>,
     Error,
-    IAdminPostUploadsFileReq
+    AdminCreateUploadPayload
   >
 ) => {
   const { client } = useMedusa()
   const queryClient = useQueryClient()
 
-  return useMutation((payload: IAdminPostUploadsFileReq) => {
+  return useMutation((payload: AdminCreateUploadPayload) => {
     return client.admin.uploads.create(payload)
   }, buildOptions(queryClient, undefined, options))
 }
@@ -34,13 +33,13 @@ export const useAdminUploadProtectedFile = (
   options?: UseMutationOptions<
     Response<AdminUploadsRes>,
     Error,
-    IAdminPostUploadsFileReq
+    AdminCreateUploadPayload
   >
 ) => {
   const { client } = useMedusa()
   const queryClient = useQueryClient()
 
-  return useMutation((payload: IAdminPostUploadsFileReq) => {
+  return useMutation((payload: AdminCreateUploadPayload) => {
     return client.admin.uploads.createProtected(payload)
   }, buildOptions(queryClient, undefined, options))
 }