diff --git a/src/components/Availability/AvailabilitySpaceAllocation.tsx b/src/components/Availability/AvailabilitySpaceAllocation.tsx index 86cf24e..79bbe7c 100644 --- a/src/components/Availability/AvailabilitySpaceAllocation.tsx +++ b/src/components/Availability/AvailabilitySpaceAllocation.tsx @@ -1,6 +1,5 @@ import { CodexNodeSpace } from "@codex-storage/sdk-js"; import { AvailabilityState } from "./types"; -import { GB, TB } from "../../utils/constants"; import { SpaceAllocation } from "@codex-storage/marketplace-ui-components"; import "./AvailabilitySpaceAllocation.css"; import { availabilityUnit } from "./availability.domain"; @@ -24,15 +23,15 @@ export function AvailabilitySpaceAllocation({ availability, space }: Props) { const spaceData = [ { title: "Space allocated", - size: allocated, + size: Math.trunc(allocated), }, { title: "New space allocation", - size: size, + size: Math.trunc(size), }, { title: "Remaining space", - size: remaining, + size: Math.trunc(remaining), }, ]; diff --git a/src/components/Availability/availability.domain.ts b/src/components/Availability/availability.domain.ts index 3175fa5..909f326 100644 --- a/src/components/Availability/availability.domain.ts +++ b/src/components/Availability/availability.domain.ts @@ -5,16 +5,15 @@ import { AvailabilityState } from "./types"; export const availabilityUnit = (unit: "gb" | "tb") => unit === "gb" ? GB : TB; -export const availabilityMax = (space: CodexNodeSpace, unit: "gb" | "tb") => { - const bytes = availabilityUnit(unit); - return space.quotaMaxBytes / bytes - space.quotaReservedBytes / bytes; -}; +export const availabilityMax = (space: CodexNodeSpace) => + space.quotaMaxBytes - space.quotaReservedBytes - space.quotaUsedBytes; export const isAvailabilityValid = ( - totalSize: string | number, + availability: AvailabilityState, max: number ) => { - const size = parseFloat(totalSize.toString()); + const unit = availabilityUnit(availability.totalSizeUnit); + const size = parseFloat(availability.totalSize.toString()) * unit; return size > 0 && size <= max; };