From 72a753879c25eb85c232d9ac5f90fee55524a353 Mon Sep 17 00:00:00 2001
From: Arnaud <arnaud@status.im>
Date: Thu, 10 Oct 2024 11:13:53 +0200
Subject: [PATCH] Fix merge issues

---
 package-lock.json                             | 43 +------------------
 .../Availability/useAvailabilityMutation.ts   |  4 +-
 src/routes/dashboard/availabilities.tsx       |  2 +-
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6f42f4..64da9a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,47 +42,6 @@
         "node": ">=18"
       }
     },
-    "../storybook": {
-      "name": "@codex-storage/marketplace-ui-components",
-      "version": "0.0.16",
-      "license": "MIT",
-      "dependencies": {
-        "lucide-react": "^0.441.0"
-      },
-      "devDependencies": {
-        "@chromatic-com/storybook": "^2.0.2",
-        "@storybook/addon-essentials": "^8.2.9",
-        "@storybook/addon-interactions": "^8.2.9",
-        "@storybook/addon-links": "^8.2.9",
-        "@storybook/addon-onboarding": "^8.2.9",
-        "@storybook/blocks": "^8.2.9",
-        "@storybook/react": "^8.2.9",
-        "@storybook/react-vite": "^8.2.9",
-        "@storybook/test": "^8.2.9",
-        "@typescript-eslint/eslint-plugin": "^8.6.0",
-        "@typescript-eslint/parser": "^8.0.0",
-        "@vitejs/plugin-react": "^4.3.1",
-        "eslint": "^8.57.0",
-        "eslint-plugin-react-hooks": "^4.6.2",
-        "eslint-plugin-react-refresh": "^0.4.7",
-        "glob": "^9.3.5",
-        "prettier": "^3.3.3",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "storybook": "^8.2.9",
-        "typescript": "5.5.2",
-        "vite-plugin-dts": "^4.0.3",
-        "vite-plugin-lib-inject-css": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@codex-storage/sdk-js": "^0.0.6",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1"
-      }
-    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "dev": true,
@@ -4555,4 +4514,4 @@
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/Availability/useAvailabilityMutation.ts b/src/components/Availability/useAvailabilityMutation.ts
index b05bf92..9727de6 100644
--- a/src/components/Availability/useAvailabilityMutation.ts
+++ b/src/components/Availability/useAvailabilityMutation.ts
@@ -12,6 +12,7 @@ import { CodexSdk } from "../../sdk/codex";
 import { AvailabilityStorage } from "../../utils/availabilities-storage";
 import { CodexAvailabilityCreateResponse } from "@codex-storage/sdk-js";
 
+
 export function useAvailabilityMutation(
   dispatch: Dispatch<StepperAction>,
   state: StepperState
@@ -29,12 +30,11 @@ export function useAvailabilityMutation(
       name,
       ...input
     }: AvailabilityState) => {
-      const unit = totalSizeUnit === "gb" ? GB : TB;
       const time = Times.toSeconds(duration, durationUnit);
 
       const fn: (
         input: Omit<AvailabilityState, "totalSizeUnit" | "durationUnit">
-      ) => Promise<unknown> = input.id
+      ) => Promise<"" | CodexAvailabilityCreateResponse> = input.id
           ? (input) =>
             CodexSdk.marketplace()
               .updateAvailability({ ...input, id: input.id || "" })
diff --git a/src/routes/dashboard/availabilities.tsx b/src/routes/dashboard/availabilities.tsx
index 70bf728..fe0a012 100644
--- a/src/routes/dashboard/availabilities.tsx
+++ b/src/routes/dashboard/availabilities.tsx
@@ -40,7 +40,7 @@ export function Availabilities() {
           .then((data) =>
             Promise.all(
               data.map((a) =>
-                CodexSdk.marketplace
+                CodexSdk.marketplace()
                   .reservations(a.id)
                   .then((res) => {
                     if (res.error) {