diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
index 39681b03ec..27e3300948 100644
--- a/apps/admin-ui/gql/gql-types.ts
+++ b/apps/admin-ui/gql/gql-types.ts
@@ -1689,14 +1689,6 @@ export enum PriceUnit {
   PerWeek = "PER_WEEK",
 }
 
-/** An enumeration. */
-export enum PricingType {
-  /** Maksuton */
-  Free = "FREE",
-  /** Maksullinen */
-  Paid = "PAID",
-}
-
 /** An enumeration. */
 export enum Priority {
   Primary = "PRIMARY",
@@ -4089,8 +4081,6 @@ export type ReservationUnitPricingNode = Node & {
   lowestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
   priceUnit: PriceUnit;
-  pricingType?: Maybe<PricingType>;
-  status: Status;
   taxPercentage: TaxPercentageNode;
 };
 
@@ -4098,12 +4088,11 @@ export type ReservationUnitPricingSerializerInput = {
   begins: Scalars["Date"]["input"];
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
   priceUnit?: InputMaybe<PriceUnit>;
-  pricingType?: InputMaybe<PricingType>;
-  status: Status;
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -4737,12 +4726,20 @@ export type SpaceUpdateMutationPayload = {
 
 /** An enumeration. */
 export enum Status {
-  /** aktiivinen */
-  Active = "ACTIVE",
-  /** tuleva */
-  Future = "FUTURE",
-  /** mennyt */
-  Past = "PAST",
+  /** Peruttu */
+  Cancelled = "CANCELLED",
+  /** Luonnos */
+  Draft = "DRAFT",
+  /** Rauennut */
+  Expired = "EXPIRED",
+  /** Käsitelty */
+  Handled = "HANDLED",
+  /** Käsittelyssä */
+  InAllocation = "IN_ALLOCATION",
+  /** Vastaanotettu */
+  Received = "RECEIVED",
+  /** Päätökset lähetetty */
+  ResultSent = "RESULT_SENT",
 }
 
 export type SuitableTimeRangeNode = Node & {
@@ -5236,12 +5233,11 @@ export type UpdateReservationUnitPricingSerializerInput = {
   begins?: InputMaybe<Scalars["Date"]["input"]>;
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
   priceUnit?: InputMaybe<PriceUnit>;
-  pricingType?: InputMaybe<PricingType>;
-  status?: InputMaybe<Status>;
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -5928,10 +5924,8 @@ export type PricingFieldsFragment = {
   id: string;
   begins: string;
   priceUnit: PriceUnit;
-  pricingType?: PricingType | null;
   lowestPrice: string;
   highestPrice: string;
-  status: Status;
   taxPercentage: { id: string; pk?: number | null; value: string };
 };
 
@@ -6810,10 +6804,8 @@ export type ReservationUnitEditQuery = {
       id: string;
       begins: string;
       priceUnit: PriceUnit;
-      pricingType?: PricingType | null;
       lowestPrice: string;
       highestPrice: string;
-      status: Status;
       taxPercentage: { id: string; pk?: number | null; value: string };
     }>;
     applicationRoundTimeSlots: Array<{
@@ -8405,10 +8397,8 @@ export type ReservationQuery = {
         id: string;
         begins: string;
         priceUnit: PriceUnit;
-        pricingType?: PricingType | null;
         lowestPrice: string;
         highestPrice: string;
-        status: Status;
         taxPercentage: { id: string; pk?: number | null; value: string };
       }>;
       metadataSet?: {
@@ -8706,10 +8696,8 @@ export type ReservationUnitPricingFragment = {
     id: string;
     begins: string;
     priceUnit: PriceUnit;
-    pricingType?: PricingType | null;
     lowestPrice: string;
     highestPrice: string;
-    status: Status;
     taxPercentage: { id: string; pk?: number | null; value: string };
   }>;
 };
@@ -9688,7 +9676,6 @@ export const PricingFieldsFragmentDoc = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -9696,7 +9683,6 @@ export const PricingFieldsFragmentDoc = gql`
       pk
       value
     }
-    status
   }
 `;
 export const ReservationUnitPricingFragmentDoc = gql`
diff --git a/apps/admin-ui/src/i18n/messages.ts b/apps/admin-ui/src/i18n/messages.ts
index fd195682ed..e8e44b0488 100644
--- a/apps/admin-ui/src/i18n/messages.ts
+++ b/apps/admin-ui/src/i18n/messages.ts
@@ -222,6 +222,16 @@ const translations: ITranslations = {
         "Ei pystytty luomaan varauksia yli 2 vuoden päähän",
       ],
       RESERVATION_SERIES_ALREADY_STARTED: ["Toistuva varaus on jo alkanut"],
+      RESERVATION_UNIT_PRICINGS_MISSING: [
+        "Varausyksiköllä ei ole hinnoittelua",
+      ],
+      RESERVATION_UNIT_PRICINGS_NO_ACTIVE_PRICINGS: [
+        "Varausyksiköllä ei ole aktiivisia hinnoitteluita",
+      ],
+      RESERVATION_UNIT_PRICINGS_DUPLICATE_DATE: ["Päivämäärä on jo käytössä"],
+      RESERVATION_UNIT_PRICINGS_INVALID_PRICES: [
+        "Hinnoittelussa on virheellisiä hintoja",
+      ],
     },
     descriptive: {
       "Reservation overlaps with reservation before due to buffer time.": [
@@ -1334,10 +1344,11 @@ const translations: ITranslations = {
       pricingType: ["Varausyksikön maksullisuus"],
       pricingTerms: ["Hinnoitteluperiaate"],
       pricingTypes: {
-        PAID: ["Maksullinen"],
-        FREE: ["Maksuton"],
+        paid: ["Maksullinen"],
+        free: ["Maksuton"],
       },
-      priceChange: ["Hintaan on tulossa muutos"],
+      hasFuturePrice: ["Hintaan on tulossa muutos"],
+      begins: ["Alkaa"],
       openingTime: ["Alkamisaika"],
       closingTime: ["Päättymisaika"],
     },
@@ -1413,12 +1424,6 @@ const translations: ITranslations = {
         `Kuvaus kirjoitetaan standardointipohjan mukaisesti.
       Lisää linkkejä ulkoisille verkkosivuille kuten käyttöohjeisiin vain tarvittaessa. Tarkista linkkien toimivuus ja saavutettavuus säännöllisesti. Käytäthän muotoiluja harkiten. `,
       ],
-      images: [
-        `Liitä vähintään kolme kuvaa. Kuvien tulisi olla todenmukaisia ja hyvälaatuisia.
-      Suositus:
-      lisää ensisijaisesti vaakatasossa kuvattuja kuvia, ei kuitenkaan panoramoja. jpeg/jpg ja png, max 1 M
-      Kuvissa näkyviltä ihmisiltä tulee olla kuvauslupa. Kuvissa ei saa näkyä turvakameroita.`,
-      ],
       publishingSettings: [
         `Voit ajastaa varausyksikön julkaistavaksi tai piilotettavaksi asiakkailta tiettynä ajankohtana.`,
       ],
@@ -1705,6 +1710,12 @@ const translations: ITranslations = {
     deleteImage: ["Poista"],
     mainImage: ["Pääkuva"],
     useAsMainImage: ["Käytä pääkuvana"],
+    tooltip: [
+      `Liitä vähintään kolme kuvaa. Kuvien tulisi olla todenmukaisia ja hyvälaatuisia.
+      Suositus:
+      lisää ensisijaisesti vaakatasossa kuvattuja kuvia, ei kuitenkaan panoramoja. jpeg/jpg ja png, max 1 M
+      Kuvissa näkyviltä ihmisiltä tulee olla kuvauslupa. Kuvissa ei saa näkyä turvakameroita.`,
+    ],
   },
   priceUnit: {
     FIXED: ["Per kerta"],
diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/ActivationGroup.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/ActivationGroup.tsx
index a658d5b16d..f4a215860b 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/ActivationGroup.tsx
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/ActivationGroup.tsx
@@ -34,17 +34,14 @@ export function ActivationGroup<T extends FieldValues>({
   style,
   className,
 }: ControllerProps<T>): JSX.Element {
-  const { field } = useController({ control, name });
+  const {
+    field: { value, onChange },
+  } = useController({ control, name });
 
   return (
     <Wrapper $noMargin={noMargin} style={style} className={className}>
-      <Checkbox
-        id={name}
-        label={label}
-        checked={field.value}
-        onChange={field.onChange}
-      />
-      {field.value ? (
+      <Checkbox id={name} label={label} checked={value} onChange={onChange} />
+      {value ? (
         <Wrapper $noMargin={noMargin}>
           <Indent $noIndent={noIndent}>{children}</Indent>
         </Wrapper>
diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/ImageEditor.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/ImageEditor.tsx
index 67e8fcfb1d..3d6ecdc3d2 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/ImageEditor.tsx
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/ImageEditor.tsx
@@ -38,6 +38,16 @@ function RUImage({ image }: { image: ImageFormType }): JSX.Element {
 let fakePk = -1;
 
 const FileInputContainer = styled.div`
+  & button {
+    --background-color-hover: var(--color-black-5);
+    --color-hover: var(--color-black);
+    --background-color-focus: transparent;
+    --color-focus: var(--color-black) --focus-outline-color:
+      var(--color-focus-outline);
+    --color: var(--color-black);
+    --border-color: var(--color-black);
+  }
+
   div:nth-of-type(3) {
     width: 100%;
     button {
@@ -61,7 +71,10 @@ const FileInputContainer = styled.div`
   }
 `;
 
-const SmallButton = styled(Button)`
+const SmallButton = styled(Button).attrs({
+  variant: "secondary",
+  theme: "black",
+})`
   border: 0;
   padding: 0;
   min-height: 0;
@@ -94,7 +107,6 @@ function ReservationUnitImage({
           <span>{t("ImageEditor.mainImage")}</span>
         ) : (
           <SmallButton
-            variant="secondary"
             disabled={isMain || image.pk == null}
             onClick={() => makeIntoMainImage(image.pk ?? 0)}
           >
@@ -102,7 +114,6 @@ function ReservationUnitImage({
           </SmallButton>
         )}
         <SmallButton
-          variant="secondary"
           disabled={image.pk == null}
           onClick={() => deleteImage(image.pk ?? 0)}
         >
@@ -177,7 +188,7 @@ export function ImageEditor({
             dragAndDropInputLabel=" "
             maxSize={5242880}
             onChange={(files) => addImage(files)}
-            tooltipText={t("ReservationUnitEditor.tooltip.images")}
+            tooltipText={t("ImageEditor.tooltip")}
           />
         </FileInputContainer>
       </div>
diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/PricingType.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/PricingType.tsx
index 0807c84559..42e308ea4c 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/PricingType.tsx
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/PricingType.tsx
@@ -1,19 +1,16 @@
 import React from "react";
 import styled from "styled-components";
 import { useTranslation } from "react-i18next";
-import {
-  DateInput,
-  IconAlertCircleFill,
-  NumberInput,
-  RadioButton,
-  Select,
-} from "hds-react";
-import { PriceUnit, PricingType } from "@gql/gql-types";
+import { IconAlertCircleFill, RadioButton } from "hds-react";
+import { PriceUnit } from "@gql/gql-types";
 import { Controller, UseFormReturn } from "react-hook-form";
 import { addDays } from "date-fns";
 import { AutoGrid } from "@/styles/layout";
 import { getTranslatedError } from "@/common/util";
 import { type ReservationUnitEditFormValues, PaymentTypes } from "./form";
+import { ControlledDateInput } from "common/src/components/form";
+import { ControlledSelect } from "common/src/components/form/ControlledSelect";
+import { ControlledNumberInput } from "common/src/components/form/ControlledNumberInput";
 
 const Error = styled.div`
   margin-top: var(--spacing-3-xs);
@@ -27,9 +24,25 @@ const Error = styled.div`
 `;
 
 type Props = {
-  index: number;
+  pk: number;
   form: UseFormReturn<ReservationUnitEditFormValues>;
-  taxPercentageOptions: { label: string; value: number }[];
+  taxPercentageOptions: PricingOption[];
+};
+
+function removeTax(price: number, taxPercentage: number) {
+  const tmp = (price * 100) / (100 + taxPercentage);
+  return Math.floor(tmp * 100) / 100;
+}
+
+function addTax(price: number, taxPercentage: number) {
+  const tmp = price * ((100 + taxPercentage) / 100);
+  return Math.floor(tmp * 100) / 100;
+}
+
+export type PricingOption = {
+  label: string;
+  pk: number;
+  value: number;
 };
 
 function PaidPricingPart({
@@ -39,10 +52,10 @@ function PaidPricingPart({
 }: {
   form: UseFormReturn<ReservationUnitEditFormValues>;
   index: number;
-  taxPercentageOptions: { label: string; value: number }[];
+  taxPercentageOptions: PricingOption[];
 }) {
   const { t } = useTranslation();
-  const { control, setValue, formState, register, watch } = form;
+  const { control, setValue, formState, watch } = form;
   const { errors } = formState;
 
   const unitPriceOptions = Object.values(PriceUnit).map((choice) => ({
@@ -55,234 +68,150 @@ function PaidPricingPart({
     value,
   }));
 
-  const removeTax = (price: number, taxPercentage: number) => {
-    const tmp = (price * 100) / (100 + taxPercentage);
-    const tmp2 = Math.round(tmp * 100) / 100;
-    return tmp2;
-  };
-
-  const addTax = (price: number, taxPercentage: number) => {
-    const tmp = price * ((100 + taxPercentage) / 100);
-    const tmp2 = Math.round(tmp * 100) / 100;
-    return tmp2;
-  };
-
   const pricing = watch(`pricings.${index}`);
-
-  const taxPercentage = watch(`pricings.${index}.taxPercentage`).value ?? 0;
+  const taxPercentagePk = watch(`pricings.${index}.taxPercentage`);
+  const taxPercentage =
+    taxPercentageOptions.find((x) => x.pk === taxPercentagePk)?.value ?? 0;
 
   // TODO mobile number keyboard?
   return (
     <>
-      <Controller
+      <ControlledSelect
         name={`pricings.${index}.priceUnit`}
         control={control}
-        render={({ field: { value, onChange } }) => (
-          <Select
-            id={`pricings.${index}.priceUnit`}
-            placeholder={t("common.select")}
-            label={t("ReservationUnitEditor.label.priceUnit")}
-            style={{ gridColumnStart: "1" }}
-            required
-            options={unitPriceOptions}
-            onChange={(v: { value: PriceUnit; label: string }) =>
-              onChange(v.value)
-            }
-            value={
-              unitPriceOptions.find((option) => option.value === value) ?? null
-            }
-            tooltipText={t("ReservationUnitEditor.tooltip.priceUnit")}
-            error={getTranslatedError(
-              t,
-              errors.pricings?.[index]?.priceUnit?.message
-            )}
-            invalid={errors.pricings?.[index]?.priceUnit?.message != null}
-          />
+        label={t("ReservationUnitEditor.label.priceUnit")}
+        style={{ gridColumnStart: "1" }}
+        required
+        options={unitPriceOptions}
+        tooltip={t("ReservationUnitEditor.tooltip.priceUnit")}
+        error={getTranslatedError(
+          t,
+          errors.pricings?.[index]?.priceUnit?.message
         )}
       />
-      <Controller
+      <ControlledSelect
         name={`pricings.${index}.taxPercentage`}
         control={control}
-        render={({ field: { value, onChange } }) => (
-          <Select
-            id={`pricings.${index}.taxPercentage.pk`}
-            placeholder={t("common.select")}
-            required
-            label={t(`ReservationUnitEditor.label.taxPercentage`)}
-            options={taxPercentageOptions}
-            onChange={(v: { value: number; label: string }) => {
-              onChange({ pk: v.value, value: Number(v.label) });
-              const low = Number(pricing?.lowestPrice);
-              const high = Number(pricing?.highestPrice);
-              const tax = pricing?.taxPercentage.value ?? 0;
-              if (!Number.isNaN(low)) {
-                const lowNet = removeTax(low, tax);
-                setValue(`pricings.${index}.lowestPriceNet`, lowNet);
-              }
-              if (!Number.isNaN(high)) {
-                const highNet = removeTax(high, tax);
-                setValue(`pricings.${index}.highestPriceNet`, highNet);
-              }
-            }}
-            value={
-              taxPercentageOptions.find(
-                (option) => option.value === value.pk
-              ) ?? null
-            }
-            error={getTranslatedError(
-              t,
-              errors.pricings?.[index]?.taxPercentage?.message
-            )}
-            invalid={errors.pricings?.[index]?.taxPercentage?.message != null}
-          />
+        required
+        label={t(`ReservationUnitEditor.label.taxPercentage`)}
+        options={taxPercentageOptions.map((x) => ({
+          label: x.label,
+          value: x.pk,
+        }))}
+        afterChange={(val) => {
+          const low = pricing.lowestPrice;
+          const high = pricing.highestPrice;
+          const tax =
+            taxPercentageOptions.find((x) => x.pk === val)?.value ?? 0;
+          if (!Number.isNaN(low)) {
+            const lowNet = removeTax(low, tax);
+            setValue(`pricings.${index}.lowestPriceNet`, lowNet);
+          }
+          if (!Number.isNaN(high)) {
+            const highNet = removeTax(high, tax);
+            setValue(`pricings.${index}.highestPriceNet`, highNet);
+          }
+        }}
+        error={getTranslatedError(
+          t,
+          errors.pricings?.[index]?.taxPercentage?.message
         )}
       />
-      <NumberInput
-        {...register(`pricings.${index}.lowestPriceNet`, {
-          required: true,
-          onChange: (e) => {
-            const val = Number(e.currentTarget.value);
-            if (!Number.isNaN(val)) {
-              setValue(
-                `pricings.${index}.lowestPrice`,
-                addTax(val, taxPercentage)
-              );
-            }
-          },
-          setValueAs: (val) => (val !== "" ? Number(val) : null),
-        })}
-        id={`pricings.${index}.lowestPriceNet`}
+      <ControlledNumberInput
+        name={`pricings.${index}.lowestPriceNet`}
         required
+        control={control}
+        afterChange={(value) => {
+          if (value != null) {
+            setValue(
+              `pricings.${index}.lowestPrice`,
+              addTax(value, taxPercentage)
+            );
+          }
+        }}
         label={t("ReservationUnitEditor.label.lowestPriceNet")}
-        minusStepButtonAriaLabel={t("common.decreaseByOneAriaLabel")}
-        plusStepButtonAriaLabel={t("common.increaseByOneAriaLabel")}
-        step={1}
         min={0}
-        max={undefined}
         errorText={getTranslatedError(
           t,
           errors.pricings?.[index]?.lowestPriceNet?.message
         )}
-        invalid={errors.pricings?.[index]?.lowestPriceNet?.message != null}
       />
-      <NumberInput
-        {...register(`pricings.${index}.lowestPrice`, {
-          required: true,
-          onChange: (e) => {
-            const val = Number(e.currentTarget.value);
-            if (!Number.isNaN(val)) {
-              setValue(
-                `pricings.${index}.lowestPriceNet`,
-                removeTax(val, taxPercentage)
-              );
-            }
-          },
-          setValueAs: (val) => (val !== "" ? Number(val) : null),
-        })}
-        id={`pricings.${index}.lowestPrice`}
+      <ControlledNumberInput
         required
+        name={`pricings.${index}.lowestPrice`}
+        control={control}
+        afterChange={(value) => {
+          if (value != null) {
+            setValue(
+              `pricings.${index}.lowestPriceNet`,
+              removeTax(value, taxPercentage)
+            );
+          }
+        }}
         label={t("ReservationUnitEditor.label.lowestPrice")}
-        minusStepButtonAriaLabel={t("common.decreaseByOneAriaLabel")}
-        plusStepButtonAriaLabel={t("common.increaseByOneAriaLabel")}
-        step={1}
+        tooltipText={t("ReservationUnitEditor.tooltip.lowestPrice")}
         min={0}
-        max={undefined}
         errorText={getTranslatedError(
           t,
           errors.pricings?.[index]?.lowestPrice?.message
         )}
-        invalid={errors.pricings?.[index]?.lowestPrice?.message != null}
-        tooltipText={t("ReservationUnitEditor.tooltip.lowestPrice")}
       />
-      <NumberInput
-        {...register(`pricings.${index}.highestPriceNet`, {
-          required: true,
-          onChange: (e) => {
-            const val = Number(e.currentTarget.value);
-            if (!Number.isNaN(val)) {
-              setValue(
-                `pricings.${index}.highestPrice`,
-                addTax(val, taxPercentage)
-              );
-            }
-          },
-          setValueAs: (val) => (val !== "" ? Number(val) : null),
-        })}
+      <ControlledNumberInput
+        name={`pricings.${index}.highestPriceNet`}
         required
-        id={`pricings.${index}.highestPriceNet`}
+        control={control}
+        afterChange={(value) => {
+          if (value != null) {
+            setValue(
+              `pricings.${index}.highestPrice`,
+              addTax(value, taxPercentage)
+            );
+          }
+        }}
         label={t("ReservationUnitEditor.label.highestPriceNet")}
-        minusStepButtonAriaLabel={t("common.decreaseByOneAriaLabel")}
-        plusStepButtonAriaLabel={t("common.increaseByOneAriaLabel")}
-        step={1}
         min={0}
-        max={undefined}
         errorText={getTranslatedError(
           t,
           errors.pricings?.[index]?.highestPriceNet?.message
         )}
-        invalid={errors.pricings?.[index]?.highestPriceNet?.message != null}
       />
-      <NumberInput
-        {...register(`pricings.${index}.highestPrice`, {
-          required: true,
-          onChange: (e) => {
-            const val = Number(e.currentTarget.value);
-            if (!Number.isNaN(val)) {
-              setValue(
-                `pricings.${index}.highestPriceNet`,
-                removeTax(val, taxPercentage)
-              );
-            }
-          },
-          setValueAs: (val) => (val !== "" ? Number(val) : null),
-        })}
+      <ControlledNumberInput
+        name={`pricings.${index}.highestPrice`}
         required
-        id={`pricings.${index}.highestPrice`}
+        control={control}
+        afterChange={(value) => {
+          if (value != null) {
+            setValue(
+              `pricings.${index}.highestPriceNet`,
+              removeTax(value, taxPercentage)
+            );
+          }
+        }}
         label={t("ReservationUnitEditor.label.highestPrice")}
-        minusStepButtonAriaLabel={t("common.decreaseByOneAriaLabel")}
-        plusStepButtonAriaLabel={t("common.increaseByOneAriaLabel")}
-        step={1}
+        tooltipText={t("ReservationUnitEditor.tooltip.highestPrice")}
         min={0}
-        max={undefined}
         errorText={getTranslatedError(
           t,
           errors.pricings?.[index]?.highestPrice?.message
         )}
-        invalid={errors.pricings?.[index]?.highestPrice?.message != null}
-        tooltipText={t("ReservationUnitEditor.tooltip.highestPrice")}
       />
-      <Controller
+      <ControlledSelect
         // This is not pricing type specific
         name="paymentTypes"
         control={control}
-        render={({ field: { value, onChange } }) => (
-          <Select
-            id={`pricings.${index}.paymentTypes`}
-            // sort
-            multiselect
-            required
-            placeholder={t("common.select")}
-            // @ts-expect-error -- Something weird with HDS multiselect typing
-            options={paymentTypeOptions}
-            onChange={(x: { value: string; label: string }[]) => {
-              onChange(x.map((y: { value: string; label: string }) => y.value));
-            }}
-            value={paymentTypeOptions.filter(
-              (x) => value.find((d) => d === x.value) != null
-            )}
-            label={t("ReservationUnitEditor.label.paymentTypes")}
-            tooltipText={t("ReservationUnitEditor.tooltip.paymentTypes")}
-            error={getTranslatedError(t, errors.paymentTypes?.message)}
-            invalid={errors.paymentTypes?.message != null}
-          />
-        )}
+        multiselect
+        required
+        options={paymentTypeOptions}
+        label={t("ReservationUnitEditor.label.paymentTypes")}
+        tooltip={t("ReservationUnitEditor.tooltip.paymentTypes")}
+        error={getTranslatedError(t, errors.paymentTypes?.message)}
       />
     </>
   );
 }
 
 export function PricingTypeView({
-  index,
+  pk,
   form,
   taxPercentageOptions,
 }: Props): JSX.Element | null {
@@ -291,45 +220,51 @@ export function PricingTypeView({
   const { control, formState, watch } = form;
   const { errors } = formState;
 
-  const pricing = watch(`pricings.${index}`);
+  const index = watch("pricings").findIndex((pricing) => pricing.pk === pk);
+  // TODO better error handling for index === -1
+  if (index === -1) {
+    return null;
+  }
 
-  const priceOptions = [PricingType.Free, PricingType.Paid] as const;
+  const isPaid = watch(`pricings.${index}.isPaid`);
+  const isFuture = watch(`pricings.${index}.isFuture`);
+  const priceOptions = ["free", "paid"];
 
   return (
-    <AutoGrid>
-      {pricing?.status === "FUTURE" && (
-        <Controller
+    <AutoGrid $alignCenter>
+      {isFuture && (
+        <ControlledDateInput
           name={`pricings.${index}.begins`}
           control={control}
-          render={({ field: { value, onChange } }) => (
-            <DateInput
-              id="futureDate"
-              value={value}
-              onChange={(val) => onChange(val)}
-              minDate={addDays(new Date(), 1)}
-              invalid={errors.pricings?.[index]?.begins?.message != null}
-              errorText={getTranslatedError(
-                t,
-                errors.pricings?.[index]?.begins?.message
-              )}
-            />
+          label={t("ReservationUnitEditor.label.begins")}
+          minDate={addDays(new Date(), 1)}
+          disableConfirmation
+          error={getTranslatedError(
+            t,
+            errors.pricings?.[index]?.begins?.message
           )}
         />
       )}
       <Controller
-        name={`pricings.${index}.pricingType`}
+        name={`pricings.${index}.isPaid`}
         control={control}
         render={({ field: { value, onChange } }) => (
           <>
             {priceOptions.map((type) => (
               <RadioButton
                 key={`pricings.${index}.pricingType.${type}`}
-                id={`pricingType.${index}.${pricing.status}.${type}`}
-                name={`pricingType.${index}.${pricing.status}`}
+                id={`pricingType.${index}.${type}`}
+                name={`pricingType.${index}`}
                 label={t(`ReservationUnitEditor.label.pricingTypes.${type}`)}
                 value={type}
-                checked={value === type}
-                onChange={onChange}
+                checked={type === (value ? "paid" : "free")}
+                onChange={(val) => {
+                  if (val.target.value === "paid") {
+                    onChange(true);
+                  } else {
+                    onChange(false);
+                  }
+                }}
               />
             ))}
           </>
@@ -341,7 +276,7 @@ export function PricingTypeView({
           <span>{getTranslatedError(t, errors.pricings.message)}</span>
         </Error>
       )}
-      {pricing?.pricingType === PricingType.Paid && (
+      {isPaid && (
         <PaidPricingPart
           form={form}
           index={index}
diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts b/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts
index 82cb7d5229..7ed38a1c34 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts
@@ -1,4 +1,4 @@
-import { filterNonNullable } from "common/src/helpers";
+import { filterNonNullable, toNumber } from "common/src/helpers";
 import {
   fromApiDate,
   fromUIDate,
@@ -8,15 +8,13 @@ import {
 import {
   ReservationStartInterval,
   Authentication,
-  PricingType,
   ReservationKind,
-  Status,
   PriceUnit,
-  type ReservationUnitPricingNode,
   ImageType,
   type ReservationUnitEditQuery,
+  ReservationUnitPricingSerializerInput,
 } from "@gql/gql-types";
-import { addDays, format } from "date-fns";
+import { addDays, endOfDay, format } from "date-fns";
 import { z } from "zod";
 import {
   checkLengthWithoutHtml,
@@ -30,62 +28,70 @@ export const PaymentTypes = ["ONLINE", "INVOICE", "ON_SITE"] as const;
 type QueryData = ReservationUnitEditQuery["reservationUnit"];
 type Node = NonNullable<QueryData>;
 
+/// @param date string in UI format
+/// @returns true if date is in the future
+function isInFuture(date: string) {
+  const d = fromUIDate(date);
+  if (d == null) {
+    return false;
+  }
+  return d > endOfDay(new Date());
+}
+
 const PricingFormSchema = z.object({
-  // pk === 0 means new pricing good decission?
   // pk === 0 fails silently on the backend, but undefined creates a new pricing
+  // on the frontend pk <= 0 is a new pricing
   pk: z.number(),
-  taxPercentage: z.object({
-    pk: z.number(),
-    value: z.number(),
-  }),
+  taxPercentage: z.number(),
+  // TODO could remove the net value and keep only the gross price
+  // the net is never sent to backend (but we want to keep it in the UI)
   lowestPrice: z.number(),
   lowestPriceNet: z.number(),
   highestPrice: z.number(),
   highestPriceNet: z.number(),
-  pricingType: z.nativeEnum(PricingType),
   priceUnit: z.nativeEnum(PriceUnit).nullable(),
-  status: z.nativeEnum(Status),
   // NOTE this has to be a string because of HDS date input in ui format: "d.M.yyyy"
   begins: z.string(),
+  // frontend only value, otherwise invalid begin values will break future dates
+  isFuture: z.boolean(),
+  // frontend only value, this is used to control if we should show price section
+  isPaid: z.boolean(),
 });
 
 type PricingFormValues = z.infer<typeof PricingFormSchema>;
 
-const refinePricing = (
+function refinePricing(
   data: PricingFormValues,
   ctx: z.RefinementCtx,
   path: string
-) => {
-  if (data.status === Status.Future) {
-    if (data.begins === "") {
-      ctx.addIssue({
-        message: "Required",
-        path: [`${path}.begins`],
-        code: z.ZodIssueCode.custom,
-      });
-    }
-    const date = fromUIDate(data.begins);
-    if (date == null || Number.isNaN(date.getTime())) {
-      ctx.addIssue({
-        message: "Invalid date",
-        path: [`${path}.begins`],
-        code: z.ZodIssueCode.custom,
-      });
-    }
-    if (date != null && date < new Date()) {
-      ctx.addIssue({
-        message: "Begin needs to be in the future",
-        path: [`${path}.begins`],
-        code: z.ZodIssueCode.custom,
-      });
-    }
+) {
+  if (data.begins === "") {
+    ctx.addIssue({
+      message: "Required",
+      path: [`${path}.begins`],
+      code: z.ZodIssueCode.custom,
+    });
+  }
+  const date = fromUIDate(data.begins);
+  if (date == null || Number.isNaN(date.getTime())) {
+    ctx.addIssue({
+      message: "Invalid date",
+      path: [`${path}.begins`],
+      code: z.ZodIssueCode.custom,
+    });
+  }
+
+  if (data.isFuture && date && date <= endOfDay(new Date())) {
+    ctx.addIssue({
+      message: "Begin needs to be in the future",
+      path: [`${path}.begins`],
+      code: z.ZodIssueCode.custom,
+    });
   }
 
-  if (data.pricingType === PricingType.Paid) {
-    const lowestPrice = Number(data.lowestPrice);
-    const highestPrice = Number(data.highestPrice);
-    const lowestPriceNet = Number(data.lowestPriceNet);
-    const highestPriceNet = Number(data.highestPriceNet);
+  if (data.isPaid) {
+    const { lowestPrice, highestPrice, lowestPriceNet, highestPriceNet } = data;
+
     if (Number.isNaN(lowestPrice)) {
       ctx.addIssue({
         message: "must be a number",
@@ -114,7 +120,7 @@ const refinePricing = (
         code: z.ZodIssueCode.custom,
       });
     }
-    if (data.taxPercentage.pk === 0) {
+    if (data.taxPercentage <= 0) {
       ctx.addIssue({
         message: "taxPercentage must be selected",
         path: [`${path}.taxPercentage`],
@@ -129,7 +135,7 @@ const refinePricing = (
       });
     }
   }
-};
+}
 
 const ImageFormSchema = z.object({
   pk: z.number().optional(),
@@ -215,10 +221,7 @@ function validateSeasonalTimes(
       }
 
       // check that the begin is before the end
-      if (
-        !Number.isNaN(Number(begin.minutes)) &&
-        !Number.isNaN(Number(begin.hours))
-      ) {
+      if (!Number.isNaN(begin.minutes) && !Number.isNaN(begin.hours)) {
         const t1 = begin.hours * 60 + begin.minutes;
         const t2 = end.hours * 60 + end.minutes;
         if (t1 >= t2 && t2 !== 0) {
@@ -252,7 +255,7 @@ function validateSeasonalTimes(
             });
           }
         }
-        if (lastEnd == null && !Number.isNaN(Number(begin.minutes))) {
+        if (lastEnd == null && !Number.isNaN(begin.minutes)) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
             message: "Not allowed to add a second time without first",
@@ -261,7 +264,7 @@ function validateSeasonalTimes(
         }
       }
 
-      if (!Number.isNaN(Number(begin.hours))) {
+      if (!Number.isNaN(begin.hours)) {
         const t2 = end.hours * 60 + end.minutes;
         lastEnd = t2;
       }
@@ -652,25 +655,21 @@ export const ReservationUnitEditSchema = z
     }
 
     // refine pricing only if not draft and the pricing is enabled
-    const enabledPricings = v.pricings.filter(
-      (p) => v.hasFuturePricing || p.status === Status.Active
-    );
-    enabledPricings.forEach((p, i) => {
+    for (let i = 0; i < v.pricings.length; i++) {
+      const p = v.pricings[i];
       refinePricing(p, ctx, `pricings.${i}`);
-    });
+    }
 
     // TODO if it includes futurePricing check that the futurePrice date is in the future (is today ok?)
-    const hasPaidPricing = enabledPricings.some(
-      (p) => p.pricingType === PricingType.Paid
-    );
-    if (hasPaidPricing && v.paymentTypes.length === 0) {
+    const isPaid = v.pricings.some((p) => p.highestPrice > 0);
+    if (isPaid && v.paymentTypes.length === 0) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         message: "Required",
         path: ["paymentTypes"],
       });
     }
-    if (v.canApplyFreeOfCharge && hasPaidPricing && v.pricingTerms == null) {
+    if (v.canApplyFreeOfCharge && isPaid && v.pricingTerms == null) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         message: "Required",
@@ -683,62 +682,63 @@ export type ReservationUnitEditFormValues = z.infer<
   typeof ReservationUnitEditSchema
 >;
 
-// NOTE decimal type is incorrectly typed as number in codegen
-function convertMaybeDecimal(value?: unknown) {
-  if (value == null || value === "") {
-    return undefined;
-  }
-  return Number(value);
-}
-
-function convertBegins(begins?: string, status?: Status) {
+function convertBegins(begins?: string) {
   const d = begins != null && begins !== "" ? fromApiDate(begins) : undefined;
   const today = new Date();
   if (d != null) {
     return toUIDate(d);
   }
-  if (status === Status.Future) {
-    return toUIDate(addDays(today, 1));
-  }
   return toUIDate(today);
 }
 
 type PricingNode = NonNullable<Node["pricings"]>[0];
 function convertPricing(p?: PricingNode): PricingFormValues {
+  const lowestPriceNet =
+    Math.floor(100 * (toNumber(p?.lowestPriceNet) ?? 0)) / 100;
+  const highestPriceNet =
+    Math.floor(100 * (toNumber(p?.highestPriceNet) ?? 0)) / 100;
   return {
     pk: p?.pk ?? 0,
-    taxPercentage: {
-      pk: p?.taxPercentage?.pk ?? 0,
-      value: convertMaybeDecimal(p?.taxPercentage?.value) ?? 0,
-    },
-    lowestPrice: convertMaybeDecimal(p?.lowestPrice) ?? 0,
-    lowestPriceNet: convertMaybeDecimal(p?.lowestPriceNet) ?? 0,
-    highestPrice: convertMaybeDecimal(p?.highestPrice) ?? 0,
-    highestPriceNet: convertMaybeDecimal(p?.highestPriceNet) ?? 0,
-    pricingType: p?.pricingType ?? PricingType.Free,
+    taxPercentage: p?.taxPercentage?.pk ?? 0,
+    lowestPrice: toNumber(p?.lowestPrice) ?? 0,
+    highestPrice: toNumber(p?.highestPrice) ?? 0,
+    lowestPriceNet,
+    highestPriceNet,
+    isPaid: (toNumber(p?.highestPrice) ?? 0) > 0,
+    isFuture: new Date(p?.begins ?? "") > new Date(),
     priceUnit: p?.priceUnit ?? null,
-    status: p?.status ?? Status.Active,
-    begins: convertBegins(p?.begins, p?.status),
+    begins: convertBegins(p?.begins),
   };
 }
 
-// Don't return past pricings (they can't be saved to backend)
-// Always return one active pricing and one future pricing
-// the boolean toggle in the form decides if the future one is shown or saved
 function convertPricingList(pricings: PricingNode[]): PricingFormValues[] {
-  const isActive = (p?: (typeof pricings)[0]) => p?.status === Status.Active;
-  const isFuture = (p?: (typeof pricings)[0]) => p?.status === Status.Future;
-
-  const active = pricings.find(isActive);
-  // NOTE using casting here because we only need the status to be set for the next step
-  const future =
-    pricings.find(isFuture) ??
-    ({
-      status: Status.Future,
-    } as ReservationUnitPricingNode);
-
-  // allow undefined's here so we create two default values always
-  return [active, future].map(convertPricing);
+  // NOTE Even though the frontend doesn't support adding more than two prices we can show / save more
+  const pris = pricings.map(convertPricing);
+  // Always include two pricings in the form data (the frontend doesn't support dynamic adding)
+  // negative pk for new pricings
+  let rollingIndex = -1;
+  // FIXME this doesn't allow adding a future price if we already have two active prices (e.g. an old price and current price)
+  while (pris.length < 2) {
+    const isFuture = pris.length > 0;
+    const begins =
+      pris.length === 0
+        ? toUIDate(new Date())
+        : toUIDate(addDays(new Date(), 1));
+
+    pris.push({
+      pk: rollingIndex--,
+      taxPercentage: 0,
+      lowestPrice: 0,
+      lowestPriceNet: 0,
+      highestPrice: 0,
+      highestPriceNet: 0,
+      isFuture,
+      isPaid: false,
+      priceUnit: null,
+      begins,
+    });
+  }
+  return pris;
 }
 
 function convertImage(image?: Node["images"][0]): ImageFormType {
@@ -890,9 +890,7 @@ export function convertReservationUnit(
       filterNonNullable(data?.applicationRoundTimeSlots)
     ),
     hasFuturePricing:
-      data?.pricings?.some(
-        (p) => p?.status != null && p?.status === Status.Future
-      ) ?? false,
+      data?.pricings?.some((p) => new Date(p.begins) > new Date()) ?? false,
     hasScheduledPublish:
       data?.publishBegins != null || data?.publishEnds != null,
     hasScheduledReservation:
@@ -907,6 +905,7 @@ export function convertReservationUnit(
   };
 }
 
+// TODO type
 export function transformReservationUnit(
   values: ReservationUnitEditFormValues
 ) {
@@ -946,9 +945,6 @@ export function transformReservationUnit(
     ...vals
   } = values;
 
-  const shouldSavePricing = (p: PricingFormValues) =>
-    hasFuturePricing || p.status === Status.Active;
-
   const isReservableTime = (t?: SeasonalFormType["reservableTimes"][0]) =>
     t && t.begin && t.end;
   // NOTE mutation doesn't support pks (even if changing not adding) unlike other mutations
@@ -1001,25 +997,27 @@ export function transformReservationUnit(
     termsOfUseFi: termsOfUseFi !== "" ? termsOfUseFi : null,
     termsOfUseSv: termsOfUseSv !== "" ? termsOfUseSv : null,
     cancellationRule: hasCancellationRule ? cancellationRule : null,
-    // TODO only one active price can be saved
-    // the form doesn't allow multiples but make sure here that we only have one active and one future and warn the user if not
-    pricings: filterNonNullable(pricings)
-      .filter(shouldSavePricing)
-      .map((p) => ({
-        begins: toApiDate(fromUIDate(p.begins) ?? new Date()) ?? "",
-        // TODO don't need to save both net and gross prices
-        highestPrice: p.highestPrice.toString(),
-        highestPriceNet: p.highestPriceNet.toString(),
-        lowestPrice: p.lowestPrice.toString(),
-        lowestPriceNet: p.lowestPriceNet.toString(),
-        ...(p.pk !== 0 ? { pk: p.pk } : {}),
-        ...(p.priceUnit != null ? { priceUnit: p.priceUnit } : {}),
-        pricingType: p.pricingType,
-        status: p.status,
-        ...(p.taxPercentage.pk !== 0
-          ? { taxPercentage: p.taxPercentage.pk }
-          : {}),
-      })),
+    pricings: filterNonNullable(
+      pricings.map((p) => transformPricing(p, hasFuturePricing))
+    ),
     applicationRoundTimeSlots,
   };
 }
+
+function transformPricing(
+  p: PricingFormValues,
+  hasFuturePricing: boolean
+): ReservationUnitPricingSerializerInput | null {
+  if (!hasFuturePricing && isInFuture(p.begins)) {
+    return null;
+  }
+  const begins = fromUIDate(p.begins) ?? new Date();
+  return {
+    ...(p.taxPercentage > 0 ? { taxPercentage: p.taxPercentage } : {}),
+    begins: toApiDate(begins) ?? "",
+    highestPrice: p.isPaid ? p.highestPrice.toString() : "0",
+    lowestPrice: p.isPaid ? p.lowestPrice.toString() : "0",
+    ...(p.pk > 0 ? { pk: p.pk } : {}),
+    ...(p.priceUnit != null ? { priceUnit: p.priceUnit } : {}),
+  };
+}
diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
index 3dffa59faa..b07c7deb14 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
@@ -25,7 +25,6 @@ import {
   type ReservationUnitPublishingState,
   type ReservationUnitReservationState,
   TermsType,
-  Status,
   ImageType,
   useUnitWithSpacesAndResourcesQuery,
   useDeleteImageMutation,
@@ -63,7 +62,7 @@ import { ArchiveDialog } from "./ArchiveDialog";
 import { ReservationStateTag, ReservationUnitStateTag } from "./tags";
 import { ActivationGroup } from "./ActivationGroup";
 import { ImageEditor } from "./ImageEditor";
-import { PricingTypeView } from "./PricingType";
+import { PricingOption, PricingTypeView } from "./PricingType";
 import { GenericDialog } from "./GenericDialog";
 import {
   type ReservationUnitEditFormValues,
@@ -74,6 +73,7 @@ import {
 } from "./form";
 import { ButtonLikeLink } from "@/component/ButtonLikeLink";
 import { SeasonalSection } from "./SeasonalSection";
+import { getValidationErrors } from "common/src/apolloUtils";
 
 const RichTextInput = dynamic(
   () => import("../../../component/RichTextInput"),
@@ -325,24 +325,25 @@ const FieldGroupHeading = styled.span`
 
 function FieldGroup({
   children,
-  id,
   heading,
   tooltip = "",
   className,
   style,
+  required,
 }: {
   heading: string;
   tooltip?: string;
-  id?: string;
   children?: React.ReactNode;
   className?: string;
   style?: React.CSSProperties;
+  required?: boolean;
 }): JSX.Element {
   return (
     <FieldGroupWrapper className={className} style={style}>
       <div>
-        <FieldGroupHeading>{heading}</FieldGroupHeading>
-        {id ? <span id={id} /> : null}
+        <FieldGroupHeading>
+          {heading} {required ? "*" : ""}
+        </FieldGroupHeading>
         <div className="ReservationUnitEditor__FieldGroup-children">
           {children}
         </div>
@@ -626,7 +627,6 @@ function BasicSection({
     >
       <AutoGrid>
         <RadioFieldGroup
-          id="reservationKind"
           heading={t("ReservationUnitEditor.label.reservationKind")}
           tooltip={t("ReservationUnitEditor.tooltip.reservationKind")}
         >
@@ -866,7 +866,6 @@ function ReservationUnitSettings({
           control={control}
           name="minReservationDuration"
           options={durationOptions}
-          placeholder={t("common.select")}
           style={{ gridColumnStart: "1" }}
           required
           label={t("ReservationUnitEditor.label.minReservationDuration")}
@@ -876,7 +875,6 @@ function ReservationUnitSettings({
         <ControlledSelect
           control={control}
           name="maxReservationDuration"
-          placeholder={t("common.select")}
           required
           options={durationOptions}
           label={t("ReservationUnitEditor.label.maxReservationDuration")}
@@ -887,7 +885,6 @@ function ReservationUnitSettings({
           control={control}
           name="reservationsMaxDaysBefore"
           options={reservationsMaxDaysBeforeOptions}
-          placeholder={t("common.select")}
           required
           label={t("ReservationUnitEditor.label.reservationsMaxDaysBefore")}
           error={getTranslatedError(
@@ -906,7 +903,6 @@ function ReservationUnitSettings({
         <ControlledSelect
           control={control}
           name="reservationStartInterval"
-          placeholder={t("common.select")}
           options={reservationStartIntervalOptions}
           required
           error={getTranslatedError(
@@ -1091,46 +1087,40 @@ function PricingSection({
   pricingTermsOptions,
 }: {
   form: UseFormReturn<ReservationUnitEditFormValues>;
-  taxPercentageOptions: { value: number; label: string }[];
+  taxPercentageOptions: PricingOption[];
   pricingTermsOptions: { value: string; label: string }[];
 }) {
   const { t } = useTranslation();
   const { control, watch, formState } = form;
   const { errors } = formState;
 
-  const isFuturePriceVisible = watch("hasFuturePricing");
-  const isPaid =
-    watch("pricings")
-      .filter((p) => p?.pricingType === "PAID")
-      .filter((p) => p.status === Status.Active || isFuturePriceVisible)
-      .length > 0;
-
+  const pricings = watch("pricings");
+  const isPaid = pricings.filter((p) => p.isPaid).length > 0;
   const hasErrors = errors.pricings != null || errors.paymentTypes != null;
+
   return (
     <Accordion
       open={hasErrors}
       heading={t("ReservationUnitEditor.label.pricings")}
     >
-      <VerticalFlex>
-        {watch("pricings").map(
-          (pricing, index) =>
-            pricing?.status === Status.Active && (
-              <FieldGroup
-                // eslint-disable-next-line react/no-array-index-key -- TODO refactor to use pk / fake pks
-                key={index}
-                id="pricings"
-                heading={`${t("ReservationUnitEditor.label.pricingType")} *`}
-                tooltip={t("ReservationUnitEditor.tooltip.pricingType")}
-              >
-                <PricingTypeView
-                  // TODO form index is bad, use pk or form key
-                  index={index}
-                  form={form}
-                  taxPercentageOptions={taxPercentageOptions}
-                />
-              </FieldGroup>
-            )
-        )}
+      <AutoGrid>
+        {watch("pricings")
+          .filter((p) => !p.isFuture)
+          .map((pricing) => (
+            <FieldGroup
+              key={`pricing-${pricing.pk}`}
+              heading={t("ReservationUnitEditor.label.pricingType")}
+              required
+              tooltip={t("ReservationUnitEditor.tooltip.pricingType")}
+              style={{ gridColumn: "1 / -1" }}
+            >
+              <PricingTypeView
+                pk={pricing.pk}
+                form={form}
+                taxPercentageOptions={taxPercentageOptions}
+              />
+            </FieldGroup>
+          ))}
         <Controller
           control={control}
           name="hasFuturePricing"
@@ -1138,31 +1128,30 @@ function PricingSection({
             <Checkbox
               checked={value}
               onChange={() => onChange(!value)}
-              label={t("ReservationUnitEditor.label.priceChange")}
+              label={t("ReservationUnitEditor.label.hasFuturePrice")}
               id="hasFuturePrice"
+              style={{ gridColumn: "1 / -1" }}
             />
           )}
         />
         {watch("hasFuturePricing") &&
-          watch("pricings").map(
-            (pricing, index) =>
-              pricing.status === Status.Future && (
-                <FieldGroup
-                  // eslint-disable-next-line react/no-array-index-key -- TODO refactor to use pk / fake pks
-                  key={index}
-                  id="pricings"
-                  heading={`${t("ReservationUnitEditor.label.pricingType")} *`}
-                  tooltip={t("ReservationUnitEditor.tooltip.pricingType")}
-                >
-                  <PricingTypeView
-                    // TODO form index is bad, use pk or form key
-                    index={index}
-                    form={form}
-                    taxPercentageOptions={taxPercentageOptions}
-                  />
-                </FieldGroup>
-              )
-          )}
+          watch("pricings")
+            .filter((p) => p.isFuture)
+            .map((pricing) => (
+              <FieldGroup
+                key={`pricing-${pricing.pk}`}
+                heading={t("ReservationUnitEditor.label.pricingType")}
+                required
+                tooltip={t("ReservationUnitEditor.tooltip.pricingType")}
+                style={{ gridColumn: "1 / -1" }}
+              >
+                <PricingTypeView
+                  pk={pricing.pk}
+                  form={form}
+                  taxPercentageOptions={taxPercentageOptions}
+                />
+              </FieldGroup>
+            ))}
         {isPaid && (
           // TODO this should be outside the pricing type because it's reservation unit wide
           <HorisontalFlex style={{ justifyContent: "space-between" }}>
@@ -1188,7 +1177,6 @@ function PricingSection({
             control={control}
             name="pricingTerms"
             label={t("ReservationUnitEditor.label.pricingTerms")}
-            placeholder={t("common.select")}
             required
             clearable
             options={pricingTermsOptions}
@@ -1196,7 +1184,7 @@ function PricingSection({
             tooltip={t("ReservationUnitEditor.tooltip.pricingTerms")}
           />
         )}
-      </VerticalFlex>
+      </AutoGrid>
     </Accordion>
   );
 }
@@ -1396,19 +1384,20 @@ function OpeningHoursSection({
   reservationUnit: Node | undefined;
   previewUrlPrefix: string;
 }) {
-  const { t } = useTranslation();
+  const { t } = useTranslation(undefined, {
+    keyPrefix: "ReservationUnitEditor",
+  });
 
   const previewUrl = `${previewUrlPrefix}/${reservationUnit?.pk}?ru=${reservationUnit?.uuid}#calendar`;
   const previewDisabled =
     previewUrlPrefix === "" || !reservationUnit?.pk || !reservationUnit?.uuid;
 
-  // TODO refactor this to inner wrapper (so we don't have a ternary in the middle)
   return (
-    <Accordion heading={t("ReservationUnitEditor.openingHours")}>
+    <Accordion heading={t("openingHours")}>
       {reservationUnit?.haukiUrl ? (
         <AutoGrid>
           <p style={{ gridColumn: "1 / -1" }}>
-            {t("ReservationUnitEditor.openingHoursHelperTextHasLink")}
+            {t("openingHoursHelperTextHasLink")}
           </p>
           <ButtonLikeLink
             disabled={!reservationUnit?.haukiUrl}
@@ -1417,7 +1406,7 @@ function OpeningHoursSection({
             fontSize="small"
             rel="noopener noreferrer"
           >
-            {t("ReservationUnitEditor.openingTimesExternalLink")}
+            {t("openingTimesExternalLink")}
             <IconLinkExternal style={{ marginLeft: "var(--spacing-xs)" }} />
           </ButtonLikeLink>
           <ButtonLikeLink
@@ -1427,12 +1416,12 @@ function OpeningHoursSection({
             fontSize="small"
             rel="noopener noreferrer"
           >
-            {t("ReservationUnitEditor.previewCalendarLink")}
+            {t("previewCalendarLink")}
             <IconLinkExternal style={{ marginLeft: "var(--spacing-xs)" }} />
           </ButtonLikeLink>
         </AutoGrid>
       ) : (
-        <p>{t("ReservationUnitEditor.openingHoursHelperTextNoLink")}</p>
+        <p>{t("openingHoursHelperTextNoLink")}</p>
       )}
     </Accordion>
   );
@@ -1458,27 +1447,27 @@ function DescriptionSection({
   const equipmentOptions = filterNonNullable(
     equipments?.edges.map((n) => n?.node)
   ).map((n) => ({
-    value: n?.pk ?? -1,
-    label: n?.nameFi ?? "no-name",
+    value: n.pk ?? -1,
+    label: n.nameFi ?? "no-name",
   }));
 
   const purposeOptions = filterNonNullable(
     purposes?.edges.map((n) => n?.node)
   ).map((n) => ({
-    value: n?.pk ?? -1,
-    label: n?.nameFi ?? "no-name",
+    value: n.pk ?? -1,
+    label: n.nameFi ?? "no-name",
   }));
   const qualifierOptions = filterNonNullable(
     qualifiers?.edges.map((n) => n?.node)
   ).map((n) => ({
-    value: n?.pk ?? -1,
-    label: n?.nameFi ?? "no-name",
+    value: n.pk ?? -1,
+    label: n.nameFi ?? "no-name",
   }));
   const reservationUnitTypeOptions = filterNonNullable(
     reservationUnitTypes?.edges.map((n) => n?.node)
   ).map((n) => ({
-    value: n?.pk ?? -1,
-    label: n?.nameFi ?? "no-name",
+    value: n.pk ?? -1,
+    label: n.nameFi ?? "no-name",
   }));
 
   const hasErrors =
@@ -1679,8 +1668,9 @@ function ReservationUnitEditor({
   const taxPercentageOptions = filterNonNullable(
     parametersData?.taxPercentages?.edges.map((e) => e?.node)
   ).map((n) => ({
-    value: n?.pk ?? -1,
-    label: n?.value.toString(),
+    value: Number(n.value),
+    pk: n.pk ?? -1,
+    label: n.value,
   }));
   const serviceSpecificTermsOptions = makeTermsOptions(
     parametersData,
@@ -1770,36 +1760,15 @@ function ReservationUnitEditor({
       refetch();
       return upPk;
     } catch (error) {
-      if (
-        error != null &&
-        typeof error === "object" &&
-        "graphQLErrors" in error
-      ) {
-        const { graphQLErrors } = error;
-        if (Array.isArray(graphQLErrors) && graphQLErrors.length > 0) {
-          if ("extensions" in graphQLErrors[0]) {
-            const { extensions } = graphQLErrors[0];
-            if ("errors" in extensions) {
-              const { errors } = extensions;
-              if (Array.isArray(errors) && errors.length > 0) {
-                let str = "";
-                for (const e of errors) {
-                  if ("message" in e) {
-                    str += `${e.message}\n`;
-                  }
-                }
-                errorToast({
-                  text: t("ReservationUnitEditor.saveFailed", { error: str }),
-                });
-                return undefined;
-              }
-            }
-          }
-        }
+      const validationErrors = getValidationErrors(error);
+      if (validationErrors.length > 0) {
+        const validationError = validationErrors[0];
+        errorToast({
+          text: t(`errors.backendValidation.${validationError.code}`),
+        });
+      } else {
+        errorToast({ text: t("ReservationDialog.saveFailed") });
       }
-      errorToast({
-        text: t("ReservationUnitEditor.saveFailed", { error: "" }),
-      });
     }
     return undefined;
   };
diff --git a/apps/admin-ui/src/spa/reservations/[id]/index.tsx b/apps/admin-ui/src/spa/reservations/[id]/index.tsx
index c76b2be148..0d17ee8ac5 100644
--- a/apps/admin-ui/src/spa/reservations/[id]/index.tsx
+++ b/apps/admin-ui/src/spa/reservations/[id]/index.tsx
@@ -9,7 +9,6 @@ import { add, startOfISOWeek } from "date-fns";
 import { breakpoints } from "common/src/common/style";
 import {
   CustomerTypeChoice,
-  PricingType,
   type ReservationQuery,
   ReservationStateChoice,
   useReservationQuery,
@@ -38,7 +37,7 @@ import { useReservationData } from "./hooks";
 import { useRecurringReservations } from "@/hooks";
 import ApprovalButtonsRecurring from "./ApprovalButtonsRecurring";
 import ReservationTitleSection from "./ReservationTitleSection";
-import { base64encode } from "common/src/helpers";
+import { base64encode, isPriceZero } from "common/src/helpers";
 import { fontMedium } from "common";
 import { formatAgeGroup } from "@/common/util";
 import Error404 from "@/common/Error404";
@@ -402,11 +401,12 @@ function RequestedReservation({
   const ref = useRef<HTMLHeadingElement>(null);
 
   const resUnit = reservation?.reservationUnits?.[0];
-  const pricing = getReservatinUnitPricing(resUnit, reservation.begin);
+  const pricing = getReservatinUnitPricing(
+    resUnit,
+    new Date(reservation.begin)
+  );
 
-  const isNonFree =
-    pricing?.pricingType === PricingType.Paid &&
-    parseFloat(pricing.highestPrice) >= 0;
+  const isNonFree = pricing != null ? !isPriceZero(pricing) : false;
 
   const reservationTagline = createTagString(reservation, t);
   const order = reservation.paymentOrder[0];
diff --git a/apps/admin-ui/src/spa/reservations/[id]/util.test.ts b/apps/admin-ui/src/spa/reservations/[id]/util.test.ts
index afc5d3c54d..bc822f9ef8 100644
--- a/apps/admin-ui/src/spa/reservations/[id]/util.test.ts
+++ b/apps/admin-ui/src/spa/reservations/[id]/util.test.ts
@@ -1,8 +1,6 @@
 import type { TFunction } from "i18next";
 import {
   PriceUnit,
-  PricingType,
-  Status,
   ReservationStateChoice,
   ReservationQuery,
   Authentication,
@@ -20,25 +18,43 @@ type PricingNodeT = ReservationUnitNodeT["pricings"][0];
 
 const mockT = ((x: string) => x) as TFunction;
 
-const PRICING_FREE: PricingNodeT = {
-  begins: "2021-01-01",
-  pricingType: PricingType.Free,
-  id: "1",
-  priceUnit: PriceUnit.PerHour,
-  lowestPrice: "120",
-  highestPrice: "120",
-  taxPercentage: {
+function constructPricing({
+  lowestPrice,
+  highestPrice,
+  begin,
+}: {
+  lowestPrice: number;
+  highestPrice: number;
+  begin: Date;
+}) {
+  return {
+    begins: toApiDate(begin) ?? "",
     id: "1",
-    value: "24",
-  },
-  status: Status.Active,
-};
-const PRICING_PAID: PricingNodeT = {
-  ...PRICING_FREE,
-  begins: "2022-01-01",
-  pricingType: PricingType.Paid,
-  status: Status.Future,
-};
+    priceUnit: PriceUnit.PerHour,
+    lowestPrice: lowestPrice.toString(),
+    highestPrice: highestPrice.toString(),
+    taxPercentage: {
+      id: "1",
+      pk: 1,
+      value: "24",
+    },
+  };
+}
+
+function constructFreePricing(): PricingNodeT {
+  return constructPricing({
+    lowestPrice: 0,
+    highestPrice: 0,
+    begin: new Date("2021-01-01"),
+  });
+}
+function constructPaidPricing(): PricingNodeT {
+  return constructPricing({
+    lowestPrice: 120,
+    highestPrice: 120,
+    begin: new Date("2022-01-01"),
+  });
+}
 
 function constructReservation(
   begin: string,
@@ -70,16 +86,19 @@ function constructReservation(
 describe("getReservatinUnitPricing", () => {
   test("returns correct pricing based on reservation date", () => {
     const input = {
-      pricings: [PRICING_FREE, PRICING_PAID],
+      pricings: [constructFreePricing(), constructPaidPricing()],
     };
 
-    expect(
-      getReservatinUnitPricing(input, "2021-02-01T00:00:01Z")?.pricingType
-    ).toBe(PricingType.Free);
-
-    expect(
-      getReservatinUnitPricing(input, "2022-02-01T00:00:01Z")?.pricingType
-    ).toBe(PricingType.Paid);
+    const first = getReservatinUnitPricing(
+      input,
+      new Date("2021-02-01T00:00:01Z")
+    );
+    const second = getReservatinUnitPricing(
+      input,
+      new Date("2022-02-01T00:00:01Z")
+    );
+    expect(first?.lowestPrice).toBe("0");
+    expect(second?.lowestPrice).toBe("120");
   });
 });
 
diff --git a/apps/admin-ui/src/spa/reservations/[id]/util.ts b/apps/admin-ui/src/spa/reservations/[id]/util.ts
index 5c36322a20..e78bd4ed35 100644
--- a/apps/admin-ui/src/spa/reservations/[id]/util.ts
+++ b/apps/admin-ui/src/spa/reservations/[id]/util.ts
@@ -9,7 +9,6 @@ import {
   type Maybe,
   CustomerTypeChoice,
   PriceUnit,
-  PricingType,
   ReservationTypeChoice,
   type ReservationCommonFragment,
   type PricingFieldsFragment,
@@ -22,7 +21,7 @@ import {
   getReserveeName,
 } from "@/common/util";
 import { fromAPIDateTime } from "@/helpers";
-import { filterNonNullable } from "common/src/helpers";
+import { filterNonNullable, toNumber } from "common/src/helpers";
 
 type ReservationType = NonNullable<ReservationQuery["reservation"]>;
 type ReservationUnitType = NonNullable<ReservationType["reservationUnits"]>[0];
@@ -49,14 +48,12 @@ export function reservationPrice(
 /** returns reservation unit pricing at given date */
 export function getReservatinUnitPricing(
   reservationUnit: Maybe<Pick<ReservationUnitType, "pricings">> | undefined,
-  datetime: string
+  d: Date
 ): PricingFieldsFragment | null {
   if (!reservationUnit?.pricings || reservationUnit.pricings.length === 0) {
     return null;
   }
 
-  const reservationDate = new Date(datetime);
-
   reservationUnit.pricings.sort((a, b) =>
     a?.begins && b?.begins
       ? (fromApiDate(a.begins)?.getTime() ?? 0) -
@@ -65,7 +62,7 @@ export function getReservatinUnitPricing(
   );
 
   return reservationUnit.pricings.reduce((prev, current) => {
-    if ((fromApiDate(current?.begins) ?? 0) < reservationDate) {
+    if ((fromApiDate(current?.begins) ?? 0) < d) {
       return current;
     }
     return prev;
@@ -77,27 +74,23 @@ export function getReservationPriceDetails(
   reservation: ReservationType,
   t: TFunction
 ): string {
-  const durationMinutes = differenceInMinutes(
-    new Date(reservation.end),
-    new Date(reservation.begin)
-  );
-
-  const pricing = getReservatinUnitPricing(
-    reservation.reservationUnits?.[0],
-    reservation.begin
-  );
+  const begin = new Date(reservation.begin);
+  const end = new Date(reservation.end);
+  const resUnit = reservation.reservationUnits?.[0];
+  const durationMinutes = differenceInMinutes(end, begin);
+  const pricing = getReservatinUnitPricing(resUnit, begin);
 
-  if (pricing == null) return "???";
+  if (pricing == null) {
+    return "???";
+  }
 
   const { priceUnit } = pricing;
   const volume = getUnRoundedReservationVolume(durationMinutes, priceUnit);
 
-  const maxPrice =
-    pricing.pricingType === PricingType.Paid ? pricing.highestPrice : "0";
+  const maxPrice = pricing.highestPrice;
   const formatters = getFormatters("fi");
 
-  const taxP = Number(pricing.taxPercentage?.value ?? "");
-  const taxPercentage = Number.isNaN(taxP) ? 0 : taxP;
+  const taxPercentage = toNumber(pricing.taxPercentage.value) ?? 0;
   return priceUnit === PriceUnit.Fixed
     ? getReservationPrice(maxPrice, t("RequestedReservation.noPrice"), false)
     : t("RequestedReservation.ApproveDialog.priceBreakdown", {
@@ -107,7 +100,7 @@ export function getReservationPriceDetails(
         unit: t(`RequestedReservation.ApproveDialog.priceUnit.${priceUnit}`),
         unitPrice: getReservationPrice(maxPrice, "", false),
         price: getReservationPrice(
-          String(volume * parseFloat(maxPrice)),
+          String(volume * (toNumber(maxPrice) ?? 0)),
           t("RequestedReservation.noPrice"),
           false
         ),
diff --git a/apps/admin-ui/src/styles/layout.tsx b/apps/admin-ui/src/styles/layout.tsx
index 8f15383102..1cb6c08add 100644
--- a/apps/admin-ui/src/styles/layout.tsx
+++ b/apps/admin-ui/src/styles/layout.tsx
@@ -84,7 +84,11 @@ export const autoGridCss = css`
   gap: var(--spacing-m);
 `;
 
-export const AutoGrid = styled.div<{ $minWidth?: string; $largeGap?: boolean }>`
+export const AutoGrid = styled.div<{
+  $minWidth?: string;
+  $largeGap?: boolean;
+  $alignCenter?: boolean;
+}>`
   display: grid;
   grid-template-columns: repeat(
     auto-fill,
@@ -94,7 +98,7 @@ export const AutoGrid = styled.div<{ $minWidth?: string; $largeGap?: boolean }>`
       1fr
     )
   );
-  align-items: baseline;
+  align-items: ${({ $alignCenter }) => ($alignCenter ? "center" : "baseline")};
   gap: ${({ $largeGap }) =>
       $largeGap ? " var(--spacing-xl)" : "var(--spacing-m)"}
     var(--spacing-m);
diff --git a/apps/ui/components/calendar/ReservationCalendarControls.tsx b/apps/ui/components/calendar/ReservationCalendarControls.tsx
index 396913ec90..8faedac3ee 100644
--- a/apps/ui/components/calendar/ReservationCalendarControls.tsx
+++ b/apps/ui/components/calendar/ReservationCalendarControls.tsx
@@ -312,6 +312,7 @@ export function ReservationCalendarControls({
   const price =
     dateValue != null && duration != null
       ? getReservationUnitPrice({
+          t,
           reservationUnit,
           pricingDate: dateValue,
           minutes: duration,
diff --git a/apps/ui/components/reservation-unit/Head.tsx b/apps/ui/components/reservation-unit/Head.tsx
index 866b790120..153e459994 100644
--- a/apps/ui/components/reservation-unit/Head.tsx
+++ b/apps/ui/components/reservation-unit/Head.tsx
@@ -155,7 +155,7 @@ function Head({
   const maxReservationDuration = formatDuration(maxDur / 60, t, true);
 
   const pricing = getActivePricing(reservationUnit);
-  const unitPrice = pricing ? getPriceString({ pricing }) : undefined;
+  const unitPrice = pricing ? getPriceString({ t, pricing }) : undefined;
 
   const isPaid = isReservationUnitPaid(reservationUnit.pricings);
   const hasSubventionSuffix = pricing && isPaid && subventionSuffix != null;
diff --git a/apps/ui/components/reservation-unit/QuickReservation.tsx b/apps/ui/components/reservation-unit/QuickReservation.tsx
index b2e84a54bb..951bb29e65 100644
--- a/apps/ui/components/reservation-unit/QuickReservation.tsx
+++ b/apps/ui/components/reservation-unit/QuickReservation.tsx
@@ -168,6 +168,7 @@ export function QuickReservation({
   );
 
   const price = getReservationUnitPrice({
+    t,
     reservationUnit,
     pricingDate: dateValue ?? new Date(),
     minutes: duration,
diff --git a/apps/ui/components/reservation-unit/RelatedUnits.tsx b/apps/ui/components/reservation-unit/RelatedUnits.tsx
index 6df24e15a3..ef37740703 100644
--- a/apps/ui/components/reservation-unit/RelatedUnits.tsx
+++ b/apps/ui/components/reservation-unit/RelatedUnits.tsx
@@ -85,7 +85,8 @@ function RelatedUnitCard({
 
   const name = getReservationUnitName(reservationUnit, lang);
   const pricing = getActivePricing(reservationUnit);
-  const unitPrice = pricing != null ? getPriceString({ pricing }) : undefined;
+  const unitPrice =
+    pricing != null ? getPriceString({ t, pricing }) : undefined;
   const reservationUnitTypeName =
     reservationUnit.reservationUnitType != null
       ? getTranslationSafe(reservationUnit.reservationUnitType, "name", lang)
diff --git a/apps/ui/components/reservation/EditStep0.tsx b/apps/ui/components/reservation/EditStep0.tsx
index eaf033cfd2..b08f21f214 100644
--- a/apps/ui/components/reservation/EditStep0.tsx
+++ b/apps/ui/components/reservation/EditStep0.tsx
@@ -162,6 +162,7 @@ export function EditStep0({
       price: isFree
         ? "0"
         : (getReservationUnitPrice({
+            t,
             reservationUnit,
             pricingDate: start,
             minutes: 0,
diff --git a/apps/ui/components/reservation/ReservationCard.tsx b/apps/ui/components/reservation/ReservationCard.tsx
index df66eda3ea..7dd28f3793 100644
--- a/apps/ui/components/reservation/ReservationCard.tsx
+++ b/apps/ui/components/reservation/ReservationCard.tsx
@@ -61,6 +61,7 @@ function ReservationCard({ reservation, type }: PropsT): JSX.Element {
   const price =
     reservation.state === ReservationStateChoice.RequiresHandling
       ? getReservationUnitPrice({
+          t,
           reservationUnit,
           pricingDate: new Date(reservation.begin),
           minutes: differenceInMinutes(
diff --git a/apps/ui/components/reservation/ReservationInfoCard.tsx b/apps/ui/components/reservation/ReservationInfoCard.tsx
index a7bdfff50e..134360936f 100644
--- a/apps/ui/components/reservation/ReservationInfoCard.tsx
+++ b/apps/ui/components/reservation/ReservationInfoCard.tsx
@@ -143,6 +143,7 @@ export function ReservationInfoCard({
     reservation.state === ReservationStateChoice.RequiresHandling ||
     shouldDisplayReservationUnitPrice
       ? getReservationUnitPrice({
+          t,
           reservationUnit,
           pricingDate: new Date(begin),
           minutes: duration,
diff --git a/apps/ui/components/search/SingleSearchReservationUnitCard.tsx b/apps/ui/components/search/SingleSearchReservationUnitCard.tsx
index 32730c2ddb..7038e469c9 100644
--- a/apps/ui/components/search/SingleSearchReservationUnitCard.tsx
+++ b/apps/ui/components/search/SingleSearchReservationUnitCard.tsx
@@ -105,7 +105,8 @@ function ReservationUnitCard({ reservationUnit }: PropsT): JSX.Element {
   const unitName = getUnitName(reservationUnit.unit ?? undefined);
 
   const pricing = getActivePricing(reservationUnit);
-  const unitPrice = pricing != null ? getPriceString({ pricing }) : undefined;
+  const unitPrice =
+    pricing != null ? getPriceString({ t, pricing }) : undefined;
 
   const reservationUnitTypeName =
     reservationUnit.reservationUnitType != null
diff --git a/apps/ui/gql/gql-types.ts b/apps/ui/gql/gql-types.ts
index 9b91fd4848..52c710b165 100644
--- a/apps/ui/gql/gql-types.ts
+++ b/apps/ui/gql/gql-types.ts
@@ -1689,14 +1689,6 @@ export enum PriceUnit {
   PerWeek = "PER_WEEK",
 }
 
-/** An enumeration. */
-export enum PricingType {
-  /** Maksuton */
-  Free = "FREE",
-  /** Maksullinen */
-  Paid = "PAID",
-}
-
 /** An enumeration. */
 export enum Priority {
   Primary = "PRIMARY",
@@ -4089,8 +4081,6 @@ export type ReservationUnitPricingNode = Node & {
   lowestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
   priceUnit: PriceUnit;
-  pricingType?: Maybe<PricingType>;
-  status: Status;
   taxPercentage: TaxPercentageNode;
 };
 
@@ -4098,12 +4088,11 @@ export type ReservationUnitPricingSerializerInput = {
   begins: Scalars["Date"]["input"];
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
   priceUnit?: InputMaybe<PriceUnit>;
-  pricingType?: InputMaybe<PricingType>;
-  status: Status;
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -4737,12 +4726,20 @@ export type SpaceUpdateMutationPayload = {
 
 /** An enumeration. */
 export enum Status {
-  /** aktiivinen */
-  Active = "ACTIVE",
-  /** tuleva */
-  Future = "FUTURE",
-  /** mennyt */
-  Past = "PAST",
+  /** Peruttu */
+  Cancelled = "CANCELLED",
+  /** Luonnos */
+  Draft = "DRAFT",
+  /** Rauennut */
+  Expired = "EXPIRED",
+  /** Käsitelty */
+  Handled = "HANDLED",
+  /** Käsittelyssä */
+  InAllocation = "IN_ALLOCATION",
+  /** Vastaanotettu */
+  Received = "RECEIVED",
+  /** Päätökset lähetetty */
+  ResultSent = "RESULT_SENT",
 }
 
 export type SuitableTimeRangeNode = Node & {
@@ -5236,12 +5233,11 @@ export type UpdateReservationUnitPricingSerializerInput = {
   begins?: InputMaybe<Scalars["Date"]["input"]>;
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
   priceUnit?: InputMaybe<PriceUnit>;
-  pricingType?: InputMaybe<PricingType>;
-  status?: InputMaybe<Status>;
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -5365,10 +5361,8 @@ export type ReservationInfoCardFragment = {
       id: string;
       begins: string;
       priceUnit: PriceUnit;
-      pricingType?: PricingType | null;
       lowestPrice: string;
       highestPrice: string;
-      status: Status;
       taxPercentage: { id: string; pk?: number | null; value: string };
     }>;
   }>;
@@ -5733,10 +5727,8 @@ export type ReservationUnitFieldsFragment = {
     id: string;
     begins: string;
     priceUnit: PriceUnit;
-    pricingType?: PricingType | null;
     lowestPrice: string;
     highestPrice: string;
-    status: Status;
     taxPercentage: { id: string; pk?: number | null; value: string };
   }>;
   images: Array<{
@@ -5936,10 +5928,8 @@ export type ListReservationsQuery = {
             id: string;
             begins: string;
             priceUnit: PriceUnit;
-            pricingType?: PricingType | null;
             lowestPrice: string;
             highestPrice: string;
-            status: Status;
             taxPercentage: { id: string; pk?: number | null; value: string };
           }>;
         }>;
@@ -6087,10 +6077,8 @@ export type ReservationQuery = {
         id: string;
         begins: string;
         priceUnit: PriceUnit;
-        pricingType?: PricingType | null;
         lowestPrice: string;
         highestPrice: string;
-        status: Status;
         taxPercentage: { id: string; pk?: number | null; value: string };
       }>;
       images: Array<{
@@ -6344,10 +6332,8 @@ export type ReservationUnitPageFieldsFragment = {
     id: string;
     begins: string;
     priceUnit: PriceUnit;
-    pricingType?: PricingType | null;
     lowestPrice: string;
     highestPrice: string;
-    status: Status;
     taxPercentage: { id: string; pk?: number | null; value: string };
   }>;
   metadataSet?: {
@@ -6507,10 +6493,8 @@ export type ReservationUnitQuery = {
       id: string;
       begins: string;
       priceUnit: PriceUnit;
-      pricingType?: PricingType | null;
       lowestPrice: string;
       highestPrice: string;
-      status: Status;
       taxPercentage: { id: string; pk?: number | null; value: string };
     }>;
     metadataSet?: {
@@ -6710,10 +6694,8 @@ export type ReservationUnitPageQuery = {
       id: string;
       begins: string;
       priceUnit: PriceUnit;
-      pricingType?: PricingType | null;
       lowestPrice: string;
       highestPrice: string;
-      status: Status;
       taxPercentage: { id: string; pk?: number | null; value: string };
     }>;
     metadataSet?: {
@@ -6843,10 +6825,8 @@ export type SearchReservationUnitsQuery = {
           id: string;
           begins: string;
           priceUnit: PriceUnit;
-          pricingType?: PricingType | null;
           lowestPrice: string;
           highestPrice: string;
-          status: Status;
           taxPercentage: { id: string; pk?: number | null; value: string };
         }>;
         unit?: {
@@ -6942,10 +6922,8 @@ export type RelatedReservationUnitsQuery = {
           id: string;
           begins: string;
           priceUnit: PriceUnit;
-          pricingType?: PricingType | null;
           lowestPrice: string;
           highestPrice: string;
-          status: Status;
           taxPercentage: { id: string; pk?: number | null; value: string };
         }>;
       } | null;
@@ -6973,10 +6951,8 @@ export type PriceReservationUnitFragment = {
     id: string;
     begins: string;
     priceUnit: PriceUnit;
-    pricingType?: PricingType | null;
     lowestPrice: string;
     highestPrice: string;
-    status: Status;
     taxPercentage: { id: string; pk?: number | null; value: string };
   }>;
 };
@@ -7587,10 +7563,8 @@ export type PricingFieldsFragment = {
   id: string;
   begins: string;
   priceUnit: PriceUnit;
-  pricingType?: PricingType | null;
   lowestPrice: string;
   highestPrice: string;
-  status: Status;
   taxPercentage: { id: string; pk?: number | null; value: string };
 };
 
@@ -7669,7 +7643,6 @@ export const PricingFieldsFragmentDoc = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -7677,7 +7650,6 @@ export const PricingFieldsFragmentDoc = gql`
       pk
       value
     }
-    status
   }
 `;
 export const PriceReservationUnitFragmentDoc = gql`
diff --git a/apps/ui/modules/__tests__/reservationUnit.test.ts b/apps/ui/modules/__tests__/reservationUnit.test.ts
index 4d2861e777..4d1ade2954 100644
--- a/apps/ui/modules/__tests__/reservationUnit.test.ts
+++ b/apps/ui/modules/__tests__/reservationUnit.test.ts
@@ -13,10 +13,8 @@ import {
   type EquipmentNode,
   ReservationStateChoice,
   PriceUnit,
-  PricingType,
   ReservationUnitPublishingState,
   type ReservationUnitNode,
-  Status,
   Authentication,
   ReservationKind,
   ReservationStartInterval,
@@ -44,13 +42,15 @@ import mockTranslations from "../../public/locales/fi/prices.json";
 import { type ReservableMap, dateToKey, type RoundPeriod } from "../reservable";
 import { createMockReservationUnit } from "@/test/testUtils";
 import { base64encode } from "common/src/helpers";
+import { type TFunction } from "i18next";
 
+function mockT(str: string): ReturnType<TFunction> {
+  const path = str.replace("prices:", "");
+  return mockGet(mockTranslations, path);
+}
 jest.mock("next-i18next", () => ({
   i18n: {
-    t: (str: string) => {
-      const path = str.replace("prices:", "");
-      return mockGet(mockTranslations, path);
-    },
+    t: mockT,
     language: "fi",
   },
 }));
@@ -220,6 +220,7 @@ describe("getPriceString", () => {
     minutes?: number;
   }): GetPriceType {
     return {
+      t: mockT as TFunction,
       pricing: constructPricing({
         lowestPrice,
         highestPrice,
@@ -382,157 +383,103 @@ describe("getPriceString", () => {
 
 describe("isReservationUnitPublished", () => {
   test("without state", () => {
-    expect(isReservationUnitPublished({} as ReservationUnitNode)).toBe(false);
+    expect(isReservationUnitPublished({})).toBe(false);
   });
 
   test("with valid states", () => {
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.Published,
-      })
-    ).toBe(true);
-
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.ScheduledHiding,
-      })
-    ).toBe(true);
+    const input1 = {
+      publishingState: ReservationUnitPublishingState.Published,
+    };
+    expect(isReservationUnitPublished(input1)).toBe(true);
+    const input2 = {
+      publishingState: ReservationUnitPublishingState.ScheduledHiding,
+    };
+    expect(isReservationUnitPublished(input2)).toBe(true);
   });
 
   test("with invalid states", () => {
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.Archived,
-      })
-    ).toBe(false);
+    const archived = {
+      publishingState: ReservationUnitPublishingState.Archived,
+    };
+    expect(isReservationUnitPublished(archived)).toBe(false);
 
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.Draft,
-      })
-    ).toBe(false);
+    const draft = { publishingState: ReservationUnitPublishingState.Draft };
+    expect(isReservationUnitPublished(draft)).toBe(false);
 
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.Hidden,
-      })
-    ).toBe(false);
+    const hidden = { publishingState: ReservationUnitPublishingState.Hidden };
+    expect(isReservationUnitPublished(hidden)).toBe(false);
 
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.ScheduledPeriod,
-      })
-    ).toBe(false);
+    const scheduled = {
+      publishingState: ReservationUnitPublishingState.ScheduledPeriod,
+    };
+    expect(isReservationUnitPublished(scheduled)).toBe(false);
 
-    expect(
-      isReservationUnitPublished({
-        publishingState: ReservationUnitPublishingState.ScheduledPublishing,
-      })
-    ).toBe(false);
+    const scheduled2 = {
+      publishingState: ReservationUnitPublishingState.ScheduledPublishing,
+    };
+    expect(isReservationUnitPublished(scheduled2)).toBe(false);
   });
 });
 
+function constructEquipmentNode({
+  name,
+  categoryName,
+}: {
+  name: string;
+  categoryName?: string;
+}): EquipmentNode {
+  const cat = categoryName || name;
+  return {
+    id: name,
+    nameFi: name,
+    name,
+    category: {
+      id: cat,
+      nameFi: cat,
+      name: cat,
+    },
+  };
+}
+
 describe("getEquipmentCategories", () => {
-  test("with equipment out of predefined order", () => {
-    const equipment: EquipmentNode[] = [
-      {
-        id: "1",
-        nameFi: "Item A",
-        name: "Item A",
-        category: {
-          id: "1",
-          nameFi: "Category A",
-          name: "Category A",
-        },
-      },
-      {
-        id: "2",
-        nameFi: "Item B",
-        name: "Item B",
-        category: {
-          id: "2",
-          nameFi: "Category B",
-          name: "Category B",
-        },
-      },
-      {
-        id: "3",
-        nameFi: "Item C",
-        name: "Item C",
-        category: {
-          id: "3",
-          nameFi: "Category C",
-          name: "Category C",
-        },
-      },
-    ];
+  test("empty equipments list", () => {
+    expect(getEquipmentCategories([])).toStrictEqual([]);
+  });
 
+  test("with equipment out of predefined order", () => {
+    const equipment: EquipmentNode[] = ["Item A", "Item B", "Item C"].map(
+      (name) => constructEquipmentNode({ name })
+    );
     expect(getEquipmentCategories(equipment)).toStrictEqual(["Muu"]);
   });
 
   test("with equipment in predefined order", () => {
     const equipment: EquipmentNode[] = [
       {
-        id: "1",
-        nameFi: "Item A",
         name: "Item A",
-        category: {
-          id: "1",
-          nameFi: "Liittimet",
-          name: "Liittimet",
-        },
+        categoryName: "Liittimet",
       },
       {
-        id: "2",
-        nameFi: "Item B",
         name: "Item B",
-        category: {
-          id: "2",
-          nameFi: "Keittiö",
-          name: "Keittiö",
-        },
+        categoryName: "Keittiö",
       },
       {
-        id: "3",
-        nameFi: "Item C",
         name: "Item C",
-        category: {
-          id: "3",
-          nameFi: "Foobar",
-          name: "Foobar",
-        },
+        categoryName: "Foobar",
       },
       {
-        id: "4",
-        nameFi: "Item D",
         name: "Item D",
-        category: {
-          id: "4",
-          nameFi: "Pelikonsoli",
-          name: "Pelikonsoli",
-        },
+        categoryName: "Pelikonsoli",
       },
       {
-        id: "5",
-        nameFi: "Item ABC 2",
         name: "Item ABC 2",
-        category: {
-          id: "2",
-          nameFi: "Keittiö",
-          name: "Keittiö",
-        },
+        categoryName: "Keittiö",
       },
       {
-        id: "6",
-        nameFi: "Item ABC 1",
         name: "Item ABC 1",
-        category: {
-          id: "2",
-          nameFi: "Keittiö",
-          name: "Keittiö",
-        },
+        categoryName: "Keittiö",
       },
-    ];
+    ].map(constructEquipmentNode);
 
     expect(getEquipmentCategories(equipment)).toStrictEqual([
       "Keittiö",
@@ -541,47 +488,17 @@ describe("getEquipmentCategories", () => {
       "Muu",
     ]);
   });
-
-  test("without categories", () => {
-    expect(getEquipmentCategories([])).toStrictEqual([]);
-  });
 });
 
 describe("getEquipmentList", () => {
-  test("with equipment out of predefined order", () => {
-    const equipment: EquipmentNode[] = [
-      {
-        id: "1",
-        nameFi: "Item A",
-        name: "Item A",
-        category: {
-          id: "1",
-          nameFi: "Category A",
-          name: "Category A",
-        },
-      },
-      {
-        id: "2",
-        nameFi: "Item B",
-        name: "Item B",
-        category: {
-          id: "2",
-          nameFi: "Category B",
-          name: "Category B",
-        },
-      },
-      {
-        id: "3",
-        nameFi: "Item C",
-        name: "Item C",
-        category: {
-          id: "3",
-          nameFi: "Category C",
-          name: "Category C",
-        },
-      },
-    ];
+  test("empty equipments list", () => {
+    expect(getEquipmentList([])).toStrictEqual([]);
+  });
 
+  test("with equipment out of predefined order", () => {
+    const equipment: EquipmentNode[] = ["Item A", "Item B", "Item C"].map(
+      (name) => constructEquipmentNode({ name })
+    );
     expect(getEquipmentList(equipment)).toStrictEqual([
       "Item A",
       "Item B",
@@ -590,39 +507,9 @@ describe("getEquipmentList", () => {
   });
 
   test("with equipment out of predefined order", () => {
-    const equipment: EquipmentNode[] = [
-      {
-        id: "1",
-        nameFi: "Item A",
-        name: "Item A",
-        category: {
-          id: "1",
-          nameFi: "Category C",
-          name: "Category C",
-        },
-      },
-      {
-        id: "2",
-        nameFi: "Item B",
-        name: "Item B",
-        category: {
-          id: "2",
-          nameFi: "Category B",
-          name: "Category B",
-        },
-      },
-      {
-        id: "3",
-        nameFi: "Item C",
-        name: "Item C",
-        category: {
-          id: "3",
-          nameFi: "Category A",
-          name: "Category A",
-        },
-      },
-    ];
-
+    const equipment: EquipmentNode[] = ["Item A", "Item B", "Item C"].map(
+      (name) => constructEquipmentNode({ name })
+    );
     expect(getEquipmentList(equipment)).toStrictEqual([
       "Item A",
       "Item B",
@@ -714,10 +601,6 @@ describe("getEquipmentList", () => {
       "Item C 2",
     ]);
   });
-
-  test("without equipment", () => {
-    expect(getEquipmentList([])).toStrictEqual([]);
-  });
 });
 
 describe("getReservationUnitName", () => {
@@ -867,8 +750,6 @@ describe("getFuturePricing", () => {
           begins: date,
           lowestPrice: 0,
           highestPrice: 10,
-          status: Status.Future,
-          pricingType: PricingType.Paid,
         })
       ),
     };
@@ -892,16 +773,12 @@ describe("getFuturePricing", () => {
   });
 
   test("should return undefined if no future pricing", () => {
-    const data = constructInput({ days });
-    expect(getFuturePricing(data)).toEqual(data.pricings[2]);
-
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    data.pricings[0]!.status = Status.Past;
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    data.pricings[1]!.status = Status.Active;
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    data.pricings[2]!.status = Status.Past;
-    expect(getFuturePricing(data)).toBeNull();
+    const d1 = constructInput({ days });
+    expect(getFuturePricing(d1)).toEqual(d1.pricings[2]);
+    const d2 = constructInput({
+      days: [addDays(new Date(), -1)],
+    });
+    expect(getFuturePricing(d2)).toBeNull();
   });
 
   test("with reservation begin time", () => {
@@ -993,23 +870,18 @@ function constructPricing({
   highestPrice,
   taxPercentage,
   begins,
-  status,
-  pricingType,
   priceUnit,
 }: {
   begins?: Date;
   lowestPrice?: number;
   highestPrice?: number;
   taxPercentage?: number;
-  status?: Status;
-  pricingType?: PricingType;
   priceUnit?: PriceUnit;
 }): NonNullable<PriceReservationUnitFragment>["pricings"][0] {
   const p = highestPrice ?? lowestPrice ?? 0;
   return {
     id: "1",
     begins: toApiDateUnsafe(begins ?? new Date()),
-    pricingType: pricingType ?? PricingType.Paid,
     priceUnit: priceUnit ?? PriceUnit.PerHour,
     lowestPrice: lowestPrice?.toString() ?? p.toString(),
     highestPrice: highestPrice?.toString() ?? p.toString(),
@@ -1017,7 +889,6 @@ function constructPricing({
       id: "1",
       value: (taxPercentage ?? 24).toString(),
     },
-    status: status ?? Status.Future,
   };
 }
 
@@ -1038,6 +909,7 @@ describe("getReservationUnitPrice", () => {
     date: Date;
   }): GetReservationUnitPriceProps {
     return {
+      t: mockT as TFunction,
       pricingDate: date,
       reservationUnit: {
         pricings: [
@@ -1064,7 +936,6 @@ describe("getReservationUnitPrice", () => {
             lowestPrice: 0,
             highestPrice: 10,
             taxPercentage: 24,
-            status: Status.Active,
           }),
         ],
       },
@@ -1074,7 +945,6 @@ describe("getReservationUnitPrice", () => {
   test("returns future data based on date lookup", () => {
     const input = connstructInput({ date: addDays(new Date(), 5) });
     expect(getReservationUnitPrice(input)).toEqual("40,00 - 50,00 € / tunti");
-
     const input2 = connstructInput({ date: addDays(new Date(), 11) });
     expect(getReservationUnitPrice(input2)).toEqual("10,00 - 20,00 € / tunti");
   });
@@ -1083,19 +953,18 @@ describe("getReservationUnitPrice", () => {
     const date = addDays(new Date(), 15);
     const input = {
       pricingDate: date,
+      t: mockT as TFunction,
       reservationUnit: {
         pricings: [
           constructPricing({
             begins: addDays(new Date(), -10),
             highestPrice: 20,
             taxPercentage: 24,
-            status: Status.Active,
           }),
           constructPricing({
             begins: addDays(new Date(), 10),
             highestPrice: 25,
             taxPercentage: 25.5,
-            status: Status.Future,
           }),
         ],
       },
@@ -1105,19 +974,17 @@ describe("getReservationUnitPrice", () => {
   test("future change in tax for free uses future price", () => {
     const date = addDays(new Date(), 15);
     const input = {
+      t: mockT as TFunction,
       pricingDate: date,
       reservationUnit: {
         pricings: [
           constructPricing({
             begins: addDays(new Date(), -10),
-            status: Status.Active,
-            pricingType: PricingType.Free,
           }),
           constructPricing({
             begins: addDays(new Date(), 10),
             highestPrice: 25,
             taxPercentage: 25.5,
-            status: Status.Future,
           }),
         ],
       },
@@ -1127,100 +994,85 @@ describe("getReservationUnitPrice", () => {
 });
 
 describe("isReservationUnitPaidInFuture", () => {
-  it("return true if active and future are paid", () => {
+  test("return true if active and future are paid", () => {
     const pricings = [
       constructPricing({
         begins: addDays(new Date(), 10),
         lowestPrice: 0,
         highestPrice: 20,
-        status: Status.Future,
       }),
       constructPricing({
         begins: addDays(new Date(), 20),
         lowestPrice: 0,
         highestPrice: 10,
-        status: Status.Active,
       }),
     ];
 
     expect(isReservationUnitPaidInFuture(pricings)).toBe(true);
   });
 
-  it("return true if only active is paid", () => {
+  test("return true if only active is paid", () => {
     const pricings = [
       constructPricing({
         begins: addDays(new Date(), 10),
         lowestPrice: 0,
         highestPrice: 0,
-        status: Status.Future,
-        pricingType: PricingType.Free,
       }),
       constructPricing({
         begins: addDays(new Date(), 20),
         lowestPrice: 0,
         highestPrice: 10,
-        status: Status.Active,
       }),
     ];
 
     expect(isReservationUnitPaidInFuture(pricings)).toBe(true);
   });
 
-  it("return true if only future one paid", () => {
+  test("return true if only future one paid", () => {
     const pricings = [
       constructPricing({
         begins: addDays(new Date(), -10),
         lowestPrice: 0,
         highestPrice: 0,
-        status: Status.Active,
-        pricingType: PricingType.Free,
       }),
       constructPricing({
         begins: addDays(new Date(), 20),
         lowestPrice: 0,
         highestPrice: 20,
-        status: Status.Future,
       }),
     ];
 
     expect(isReservationUnitPaidInFuture(pricings)).toBe(true);
   });
 
-  it("returns false if future one if paid but price is set in zero", () => {
+  test("returns false if future one if paid but price is set in zero", () => {
     const pricings = [
       constructPricing({
         begins: addDays(new Date(), 10),
         lowestPrice: 0,
         highestPrice: 0,
-        status: Status.Future,
       }),
       constructPricing({
         begins: addDays(new Date(), 20),
         lowestPrice: 0,
         highestPrice: 0,
-        status: Status.Active,
-        pricingType: PricingType.Free,
       }),
     ];
 
     expect(isReservationUnitPaidInFuture(pricings)).toBe(false);
   });
 
-  it("returns false all are free", () => {
+  test("returns false all are free", () => {
     const pricings = [
       constructPricing({
         begins: addDays(new Date(), 10),
         lowestPrice: 0,
-        highestPrice: 20,
-        status: Status.Future,
-        pricingType: PricingType.Free,
+        highestPrice: 0,
       }),
       constructPricing({
         begins: addDays(new Date(), 20),
         lowestPrice: 0,
-        highestPrice: 20,
-        status: Status.Active,
-        pricingType: PricingType.Free,
+        highestPrice: 0,
       }),
     ];
 
diff --git a/apps/ui/modules/reservationUnit.ts b/apps/ui/modules/reservationUnit.ts
index 1c69954c0a..b07533972c 100644
--- a/apps/ui/modules/reservationUnit.ts
+++ b/apps/ui/modules/reservationUnit.ts
@@ -18,9 +18,7 @@ import {
 import {
   ReservationUnitPublishingState,
   type ReservationUnitNode,
-  PricingType,
   PriceUnit,
-  Status,
   type EquipmentFieldsFragment,
   type PriceReservationUnitFragment,
   type UnitNode,
@@ -43,6 +41,8 @@ import {
 import { type PricingFieldsFragment } from "common/gql/gql-types";
 import { gql } from "@apollo/client";
 import { getIntervalMinutes } from "common/src/conversion";
+import { isPriceZero } from "common/src/helpers";
+import { TFunction } from "i18next";
 
 function formatTimeObject(time: { h: number; m: number }): string {
   return `${time.h.toString().padStart(2, "0")}:${time.m.toString().padStart(2, "0")}`;
@@ -185,11 +185,18 @@ export function getReservationUnitInstructionsKey(
   }
 }
 
+function isActivePricing(pricing: PricingFieldsFragment): boolean {
+  return new Date(pricing.begins) < new Date();
+}
+function isFuturePricing(pricing: PricingFieldsFragment): boolean {
+  return new Date(pricing.begins) > new Date();
+}
+
 export function getActivePricing(reservationUnit: {
   pricings: PricingFieldsFragment[];
 }): PricingFieldsFragment | undefined {
   const { pricings } = reservationUnit;
-  return pricings.find((pricing) => pricing.status === Status.Active);
+  return pricings.find((pricing) => isActivePricing(pricing));
 }
 
 export const RESERVATION_INFO_CARD_FRAGMENT = gql`
@@ -219,7 +226,7 @@ export function getFuturePricing(
   const now = toUIDate(new Date(), "yyyy-MM-dd");
 
   const part = pricings
-    .filter((pricing) => pricing.status === Status.Future)
+    .filter((p) => new Date(p.begins) > new Date())
     .filter((x): x is NonNullable<typeof x> => x != null);
   const futurePricings = part
     .filter((futurePricing) => futurePricing.begins > now)
@@ -270,32 +277,21 @@ function formatPrice(price: number, toCurrency?: boolean): string {
 }
 
 export type GetPriceType = {
+  t: TFunction;
   pricing: PricingFieldsFragment;
   minutes?: number; // additional minutes for total price calculation
 };
 
-function isPriceZero(pricing: PricingFieldsFragment): boolean {
-  if (
-    pricing.pricingType == null ||
-    pricing.pricingType === PricingType.Free ||
-    (pricing.pricingType === PricingType.Paid &&
-      parseFloat(pricing.highestPrice) === 0)
-  ) {
-    return true;
-  }
-  return false;
-}
-
 // TODO rewrite this return number normally
 // and a separate function to format it to string
 export function getPriceString(props: GetPriceType): string {
-  const { pricing, minutes } = props;
+  const { t, pricing, minutes = 0 } = props;
 
   if (isPriceZero(pricing)) {
-    return i18n?.t("prices:priceFree") ?? "0";
+    return t("prices:priceFree") ?? "0";
   }
 
-  const volume = getReservationVolume(minutes ?? 0, pricing.priceUnit);
+  const volume = getReservationVolume(minutes, pricing.priceUnit);
   const highestPrice = parseFloat(pricing.highestPrice) * volume;
   const lowestPrice = parseFloat(pricing.lowestPrice) * volume;
   const priceString =
@@ -305,11 +301,12 @@ export function getPriceString(props: GetPriceType): string {
   const unitString =
     pricing.priceUnit === PriceUnit.Fixed || minutes
       ? ""
-      : i18n?.t(`prices:priceUnits.${pricing.priceUnit}`);
+      : t(`prices:priceUnits.${pricing.priceUnit}`);
   return trim(`${priceString} / ${unitString}`, " / ");
 }
 
 export type GetReservationUnitPriceProps = {
+  t: TFunction;
   reservationUnit: PriceReservationUnitFragment;
   pricingDate: Date;
   minutes?: number;
@@ -318,7 +315,7 @@ export type GetReservationUnitPriceProps = {
 export function getReservationUnitPrice(
   props: GetReservationUnitPriceProps
 ): string | null {
-  const { reservationUnit: ru, pricingDate, minutes } = props;
+  const { t, reservationUnit: ru, pricingDate, minutes } = props;
   if (Number.isNaN(pricingDate.getTime())) {
     // eslint-disable-next-line no-console
     console.warn("Invalid pricing date", pricingDate);
@@ -342,6 +339,7 @@ export function getReservationUnitPrice(
   }
 
   return getPriceString({
+    t,
     pricing,
     minutes,
   });
@@ -358,8 +356,8 @@ export function isReservationUnitPaid(
   pricings: PricingFieldsFragment[],
   date?: Date
 ): boolean {
-  const active = pricings.filter((p) => p.status === Status.Active);
-  const future = pricings.filter((p) => p.status === Status.Future);
+  const active = pricings.filter((p) => isActivePricing(p));
+  const future = pricings.filter((p) => isFuturePricing(p));
   const d =
     date == null
       ? active
@@ -367,21 +365,15 @@ export function isReservationUnitPaid(
           const start = new Date(p.begins);
           return start <= date;
         });
-  return (
-    d
-      .filter((p) => p.pricingType === PricingType.Paid)
-      .filter((p) => !isPriceZero(p)).length > 0
-  );
+  return d.filter((p) => !isPriceZero(p)).length > 0;
 }
 
 export function isReservationUnitPaidInFuture(
   pricings: PricingFieldsFragment[]
 ): boolean {
   return (
-    pricings
-      .filter((p) => p.status === Status.Future || p.status === Status.Active)
-      .filter((p) => p.pricingType === PricingType.Paid)
-      .filter((p) => !isPriceZero(p)).length > 0
+    pricings.filter((p) => isFuturePricing(p)).filter((p) => !isPriceZero(p))
+      .length > 0
   );
 }
 
diff --git a/apps/ui/pages/reservation-unit/[id].tsx b/apps/ui/pages/reservation-unit/[id].tsx
index 7f4629dde2..166dd3f633 100644
--- a/apps/ui/pages/reservation-unit/[id].tsx
+++ b/apps/ui/pages/reservation-unit/[id].tsx
@@ -17,7 +17,6 @@ import { breakpoints } from "common/src/common/style";
 import { type PendingReservation } from "@/modules/types";
 import {
   type ApplicationRoundTimeSlotNode,
-  PricingType,
   type ReservationCreateMutationInput,
   useCreateReservationMutation,
   type ReservationUnitPageQuery,
@@ -31,6 +30,7 @@ import {
   base64encode,
   filterNonNullable,
   fromMondayFirstUnsafe,
+  toNumber,
 } from "common/src/helpers";
 import Head from "@/components/reservation-unit/Head";
 import { AddressSection } from "@/components/reservation-unit/Address";
@@ -897,6 +897,9 @@ function PriceChangeNotice({
     return null;
   }
 
+  const lowestPrice = toNumber(futurePricing.lowestPrice) ?? 0;
+  const taxPercentage = toNumber(futurePricing.taxPercentage.value) ?? 0;
+
   return (
     <p style={{ marginTop: 0 }}>
       <Trans
@@ -905,21 +908,19 @@ function PriceChangeNotice({
         values={{
           date: toUIDate(new Date(futurePricing.begins)),
           price: getPriceString({
+            t,
             pricing: futurePricing,
           }).toLocaleLowerCase(),
         }}
         components={{ bold: <strong /> }}
       />
-      {futurePricing.pricingType === PricingType.Paid &&
-        parseFloat(futurePricing.taxPercentage?.value ?? "") > 0 && (
-          <strong>
-            {t("reservationUnit:futurePriceNoticeTax", {
-              tax: formatters.strippedDecimal.format(
-                parseFloat(futurePricing.taxPercentage?.value ?? "")
-              ),
-            })}
-          </strong>
-        )}
+      {lowestPrice > 0 && taxPercentage > 0 && (
+        <strong>
+          {t("reservationUnit:futurePriceNoticeTax", {
+            tax: formatters.strippedDecimal.format(taxPercentage),
+          })}
+        </strong>
+      )}
       .
     </p>
   );
diff --git a/packages/common/gql/gql-types.ts b/packages/common/gql/gql-types.ts
index c10226397c..ef2621bed6 100644
--- a/packages/common/gql/gql-types.ts
+++ b/packages/common/gql/gql-types.ts
@@ -1689,14 +1689,6 @@ export enum PriceUnit {
   PerWeek = "PER_WEEK",
 }
 
-/** An enumeration. */
-export enum PricingType {
-  /** Maksuton */
-  Free = "FREE",
-  /** Maksullinen */
-  Paid = "PAID",
-}
-
 /** An enumeration. */
 export enum Priority {
   Primary = "PRIMARY",
@@ -4089,8 +4081,6 @@ export type ReservationUnitPricingNode = Node & {
   lowestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
   priceUnit: PriceUnit;
-  pricingType?: Maybe<PricingType>;
-  status: Status;
   taxPercentage: TaxPercentageNode;
 };
 
@@ -4098,12 +4088,11 @@ export type ReservationUnitPricingSerializerInput = {
   begins: Scalars["Date"]["input"];
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
   priceUnit?: InputMaybe<PriceUnit>;
-  pricingType?: InputMaybe<PricingType>;
-  status: Status;
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -4737,12 +4726,20 @@ export type SpaceUpdateMutationPayload = {
 
 /** An enumeration. */
 export enum Status {
-  /** aktiivinen */
-  Active = "ACTIVE",
-  /** tuleva */
-  Future = "FUTURE",
-  /** mennyt */
-  Past = "PAST",
+  /** Peruttu */
+  Cancelled = "CANCELLED",
+  /** Luonnos */
+  Draft = "DRAFT",
+  /** Rauennut */
+  Expired = "EXPIRED",
+  /** Käsitelty */
+  Handled = "HANDLED",
+  /** Käsittelyssä */
+  InAllocation = "IN_ALLOCATION",
+  /** Vastaanotettu */
+  Received = "RECEIVED",
+  /** Päätökset lähetetty */
+  ResultSent = "RESULT_SENT",
 }
 
 export type SuitableTimeRangeNode = Node & {
@@ -5236,12 +5233,11 @@ export type UpdateReservationUnitPricingSerializerInput = {
   begins?: InputMaybe<Scalars["Date"]["input"]>;
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
   priceUnit?: InputMaybe<PriceUnit>;
-  pricingType?: InputMaybe<PricingType>;
-  status?: InputMaybe<Status>;
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -5928,10 +5924,8 @@ export type PricingFieldsFragment = {
   id: string;
   begins: string;
   priceUnit: PriceUnit;
-  pricingType?: PricingType | null;
   lowestPrice: string;
   highestPrice: string;
-  status: Status;
   taxPercentage: { id: string; pk?: number | null; value: string };
 };
 
@@ -6270,7 +6264,6 @@ export const PricingFieldsFragmentDoc = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -6278,7 +6271,6 @@ export const PricingFieldsFragmentDoc = gql`
       pk
       value
     }
-    status
   }
 `;
 export const LocationFieldsFragmentDoc = gql`
diff --git a/packages/common/src/components/form/ControlledNumberInput.tsx b/packages/common/src/components/form/ControlledNumberInput.tsx
index e5690f9fcc..9638fc685a 100644
--- a/packages/common/src/components/form/ControlledNumberInput.tsx
+++ b/packages/common/src/components/form/ControlledNumberInput.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import { NumberInput } from "hds-react";
 import {
   type FieldValues,
-  Controller,
+  useController,
   UseControllerProps,
 } from "react-hook-form";
 import { useTranslation } from "next-i18next";
@@ -16,6 +16,9 @@ interface ControllerProps<T extends FieldValues> extends UseControllerProps<T> {
   tooltipText?: string;
   helperText?: string;
   errorText?: string;
+  afterChange?: (value: number | null) => void;
+  style?: React.CSSProperties;
+  className?: string;
 }
 
 // set some page specific defaults for translations
@@ -29,37 +32,41 @@ export function ControlledNumberInput<T extends FieldValues>({
   tooltipText,
   helperText,
   errorText,
+  afterChange,
+  style,
+  className,
 }: ControllerProps<T>) {
+  const {
+    field: { value, onChange },
+  } = useController({ control, name, rules: { required } });
   const { t } = useTranslation();
 
+  const handleChange = (evt: React.ChangeEvent<HTMLInputElement>) => {
+    const val = evt.target.value === "" ? null : parseInt(evt.target.value, 10);
+    onChange(val);
+    afterChange?.(val);
+  };
+
   // NOTE controller is needed otherwise the values default to 0 instead of null
   return (
-    <Controller
-      name={name}
-      control={control}
-      render={({ field: { value, onChange } }) => (
-        <NumberInput
-          value={value ?? ""}
-          onChange={(e) =>
-            onChange(
-              e.target.value === "" ? null : parseInt(e.target.value, 10)
-            )
-          }
-          required={required}
-          id={name}
-          label={label}
-          minusStepButtonAriaLabel={t("common.decreaseByOneAriaLabel")}
-          plusStepButtonAriaLabel={t("common.increaseByOneAriaLabel")}
-          step={1}
-          type="number"
-          min={min}
-          max={max}
-          helperText={helperText}
-          errorText={errorText}
-          invalid={errorText != null}
-          tooltipText={tooltipText}
-        />
-      )}
+    <NumberInput
+      value={value ?? ""}
+      onChange={handleChange}
+      required={required}
+      id={name}
+      label={label}
+      minusStepButtonAriaLabel={t("common.decreaseByOneAriaLabel")}
+      plusStepButtonAriaLabel={t("common.increaseByOneAriaLabel")}
+      step={1}
+      type="number"
+      min={min}
+      max={max}
+      helperText={helperText}
+      errorText={errorText}
+      invalid={errorText != null}
+      tooltipText={tooltipText}
+      style={style}
+      className={className}
     />
   );
 }
diff --git a/packages/common/src/helpers.ts b/packages/common/src/helpers.ts
index 11dc3afc68..41c32fb365 100644
--- a/packages/common/src/helpers.ts
+++ b/packages/common/src/helpers.ts
@@ -1,5 +1,9 @@
 import { isAfter, isBefore } from "date-fns";
-import { type ImageFragment, type Maybe } from "../gql/gql-types";
+import {
+  PricingFieldsFragment,
+  type ImageFragment,
+  type Maybe,
+} from "../gql/gql-types";
 import { pixel } from "./common/style";
 
 export function filterNonNullable<T>(
@@ -10,7 +14,7 @@ export function filterNonNullable<T>(
 
 /// Safe string -> number conversion
 /// handles the special cases of empty string and NaN with type safety
-export function toNumber(filter: string | null): number | null {
+export function toNumber(filter: Maybe<string> | undefined): number | null {
   if (filter == null) {
     return null;
   }
@@ -137,6 +141,17 @@ function getImageSourceWithoutDefault(
       return null;
   }
 }
+
+export function isPriceZero(
+  pricing: Pick<PricingFieldsFragment, "highestPrice">
+): boolean {
+  const price = toNumber(pricing.highestPrice);
+  if (price == null || price === 0) {
+    return true;
+  }
+  return false;
+}
+
 function pickMaybeDay(
   a: Date | undefined,
   b: Date | undefined,
diff --git a/packages/common/src/queries/fragments.tsx b/packages/common/src/queries/fragments.tsx
index 94af54f39c..7d7b6a1083 100644
--- a/packages/common/src/queries/fragments.tsx
+++ b/packages/common/src/queries/fragments.tsx
@@ -63,7 +63,6 @@ export const PRICING_FRAGMENT = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -71,7 +70,6 @@ export const PRICING_FRAGMENT = gql`
       pk
       value
     }
-    status
   }
 `;
 
diff --git a/packages/common/src/reservation-pricing.ts b/packages/common/src/reservation-pricing.ts
index 8df0a62e99..f7cdc1caab 100644
--- a/packages/common/src/reservation-pricing.ts
+++ b/packages/common/src/reservation-pricing.ts
@@ -1,4 +1,5 @@
 import { Maybe, PriceUnit } from "../gql/gql-types";
+import { toNumber } from "./helpers";
 import formatters from "./number-formatters";
 
 export const getPriceUnitMinutes = (unit: PriceUnit): number => {
@@ -72,11 +73,8 @@ export function getReservationPrice(
   trailingZeros: boolean,
   language = "fi"
 ): string {
-  if (price == null) {
-    return defaultText;
-  }
-  const p = Number(price);
-  if (Number.isNaN(p) || p === 0) {
+  const p = toNumber(price);
+  if (p == null || p === 0) {
     return defaultText;
   }
   const formatter = trailingZeros ? "currencyWithDecimals" : "currency";
diff --git a/tilavaraus.graphql b/tilavaraus.graphql
index 71831f38e9..16c771673a 100644
--- a/tilavaraus.graphql
+++ b/tilavaraus.graphql
@@ -1836,20 +1836,6 @@ enum PriceUnit {
   PER_WEEK
 }
 
-"""
-An enumeration.
-"""
-enum PricingType {
-  """
-  Maksuton
-  """
-  FREE
-  """
-  Maksullinen
-  """
-  PAID
-}
-
 """
 An enumeration.
 """
@@ -4493,8 +4479,6 @@ type ReservationUnitPricingNode implements Node {
   lowestPriceNet: Decimal
   pk: Int
   priceUnit: PriceUnit!
-  pricingType: PricingType
-  status: Status!
   taxPercentage: TaxPercentageNode!
 }
 
@@ -4502,12 +4486,11 @@ input ReservationUnitPricingSerializerInput {
   begins: Date!
   highestPrice: Decimal
   highestPriceNet: String
+  isActivatedOnBegins: Boolean
   lowestPrice: Decimal
   lowestPriceNet: String
   pk: Int
   priceUnit: PriceUnit
-  pricingType: PricingType
-  status: Status!
   taxPercentage: Int
 }
 
@@ -5228,17 +5211,33 @@ An enumeration.
 """
 enum Status {
   """
-  aktiivinen
+  Peruttu
   """
-  ACTIVE
+  CANCELLED
   """
-  tuleva
+  Luonnos
   """
-  FUTURE
+  DRAFT
   """
-  mennyt
+  Rauennut
   """
-  PAST
+  EXPIRED
+  """
+  Käsitelty
+  """
+  HANDLED
+  """
+  Käsittelyssä
+  """
+  IN_ALLOCATION
+  """
+  Vastaanotettu
+  """
+  RECEIVED
+  """
+  Päätökset lähetetty
+  """
+  RESULT_SENT
 }
 
 type SuitableTimeRangeNode implements Node {
@@ -5813,12 +5812,11 @@ input UpdateReservationUnitPricingSerializerInput {
   begins: Date
   highestPrice: Decimal
   highestPriceNet: String
+  isActivatedOnBegins: Boolean
   lowestPrice: Decimal
   lowestPriceNet: String
   pk: Int
   priceUnit: PriceUnit
-  pricingType: PricingType
-  status: Status
   taxPercentage: Int
 }