From 9d062202a6669cc99bde28885ffa498daf0619f0 Mon Sep 17 00:00:00 2001
From: Joonatan Kuosa <joonatan.kuosa@gmail.com>
Date: Tue, 10 Sep 2024 14:37:41 +0300
Subject: [PATCH] refactor: pricing API change in core

core branch: https://github.com/City-of-Helsinki/tilavarauspalvelu-core/pull/1317

refs: TILA-3525
---
 apps/admin-ui/gql/gql-types.ts                | 769 +++++++++++-------
 apps/admin-ui/src/i18n/messages.ts            |  19 +-
 .../ReservationUnit/edit/ActivationGroup.tsx  |  13 +-
 .../spa/ReservationUnit/edit/ImageEditor.tsx  |  19 +-
 .../spa/ReservationUnit/edit/PricingType.tsx  | 357 ++++----
 .../src/spa/ReservationUnit/edit/form.ts      | 244 +++---
 .../src/spa/ReservationUnit/edit/index.tsx    | 158 ++--
 .../src/spa/reservations/[id]/index.tsx       |  12 +-
 .../src/spa/reservations/[id]/util.test.ts    |  75 +-
 .../src/spa/reservations/[id]/util.ts         |  35 +-
 apps/admin-ui/src/styles/layout.tsx           |   7 +-
 .../calendar/ReservationCalendarControls.tsx  |   1 +
 apps/ui/components/reservation-unit/Head.tsx  |   2 +-
 .../reservation-unit/QuickReservation.tsx     |   1 +
 .../reservation-unit/RelatedUnits.tsx         |   3 +-
 apps/ui/components/reservation/EditStep0.tsx  |   1 +
 .../reservation/ReservationCard.tsx           |   1 +
 .../reservation/ReservationInfoCard.tsx       |   1 +
 .../SingleSearchReservationUnitCard.tsx       |   3 +-
 apps/ui/gql/gql-types.ts                      | 357 ++++----
 .../modules/__tests__/reservationUnit.test.ts |  43 +-
 apps/ui/modules/reservationUnit.ts            |  56 +-
 apps/ui/pages/reservation-unit/[id].tsx       |  23 +-
 packages/common/gql/gql-types.ts              | 121 ++-
 .../components/form/ControlledNumberInput.tsx |  61 +-
 packages/common/src/helpers.ts                |  19 +-
 packages/common/src/queries/fragments.tsx     |   2 -
 packages/common/src/reservation-pricing.ts    |   8 +-
 tilavaraus.graphql                            | 122 +--
 29 files changed, 1303 insertions(+), 1230 deletions(-)

diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
index a2e963e93e..f8ced1c39d 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",
@@ -3545,7 +3537,6 @@ export enum ReservationTypeStaffChoice {
 }
 
 export type ReservationUnitCancellationRuleNode = Node & {
-  /** Seconds before reservations related to this cancellation rule can be cancelled without handling. */
   canBeCancelledTimeBefore?: Maybe<Scalars["Duration"]["output"]>;
   /** The ID of the object */
   id: Scalars["ID"]["output"];
@@ -4081,44 +4072,27 @@ export type ReservationUnitPaymentTypeNode = Node & {
 };
 
 export type ReservationUnitPricingNode = Node & {
-  /** When pricing is activated */
   begins: Scalars["Date"]["output"];
-  /** Maximum price of the reservation unit including VAT */
   highestPrice: Scalars["Decimal"]["output"];
   highestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   /** The ID of the object */
   id: Scalars["ID"]["output"];
-  /** Minimum price of the reservation unit including VAT */
   lowestPrice: Scalars["Decimal"]["output"];
   lowestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** Unit of the price */
   priceUnit: PriceUnit;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: Maybe<PricingType>;
-  /** Status of the pricing */
-  status: Status;
-  /** The percentage of tax included in the price */
   taxPercentage: TaxPercentageNode;
 };
 
 export type ReservationUnitPricingSerializerInput = {
-  /** When pricing is activated */
   begins: Scalars["Date"]["input"];
-  /** Maximum price of the reservation unit including VAT */
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
-  /** Minimum price of the reservation unit including VAT */
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Unit of the price */
   priceUnit?: InputMaybe<PriceUnit>;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: InputMaybe<PricingType>;
-  /** Status of the pricing */
-  status: Status;
-  /** The percentage of tax included in the price */
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -4150,7 +4124,6 @@ export type ReservationUnitTypeNode = Node & {
   nameFi?: Maybe<Scalars["String"]["output"]>;
   nameSv?: Maybe<Scalars["String"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** Järjestysnumero, jota käytetään rajapinnan järjestämisessä. */
   rank?: Maybe<Scalars["Int"]["output"]>;
 };
 
@@ -4753,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 & {
@@ -4791,7 +4772,6 @@ export type TaxPercentageNode = Node & {
   /** The ID of the object */
   id: Scalars["ID"]["output"];
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** The tax percentage for a price */
   value: Scalars["Decimal"]["output"];
 };
 
@@ -5250,22 +5230,14 @@ export type UpdateReservationUnitOptionApplicantSerializerInput = {
 };
 
 export type UpdateReservationUnitPricingSerializerInput = {
-  /** When pricing is activated */
   begins?: InputMaybe<Scalars["Date"]["input"]>;
-  /** Maximum price of the reservation unit including VAT */
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
-  /** Minimum price of the reservation unit including VAT */
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Unit of the price */
   priceUnit?: InputMaybe<PriceUnit>;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: InputMaybe<PricingType>;
-  /** Status of the pricing */
-  status?: InputMaybe<Status>;
-  /** The percentage of tax included in the price */
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -5954,10 +5926,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 };
 };
 
@@ -6836,10 +6806,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<{
@@ -8431,10 +8399,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?: {
@@ -8732,10 +8698,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 };
   }>;
 };
@@ -9714,7 +9678,6 @@ export const PricingFieldsFragmentDoc = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -9722,7 +9685,6 @@ export const PricingFieldsFragmentDoc = gql`
       pk
       value
     }
-    status
   }
 `;
 export const ReservationUnitPricingFragmentDoc = gql`
@@ -9802,12 +9764,17 @@ export function useBannerNotificationsListAllLazyQuery(
   >(BannerNotificationsListAllDocument, options);
 }
 export function useBannerNotificationsListAllSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsListAllQuery,
-    BannerNotificationsListAllQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsListAllQuery,
+        BannerNotificationsListAllQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsListAllQuery,
     BannerNotificationsListAllQueryVariables
@@ -9884,12 +9851,17 @@ export function useBannerNotificationsListLazyQuery(
   >(BannerNotificationsListDocument, options);
 }
 export function useBannerNotificationsListSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsListQuery,
-    BannerNotificationsListQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsListQuery,
+        BannerNotificationsListQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsListQuery,
     BannerNotificationsListQueryVariables
@@ -9973,12 +9945,17 @@ export function useApplicationLazyQuery(
   );
 }
 export function useApplicationSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationQuery,
-    ApplicationQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationQuery,
+        ApplicationQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ApplicationQuery, ApplicationQueryVariables>(
     ApplicationDocument,
     options
@@ -10050,12 +10027,14 @@ export function useTermsOfUseLazyQuery(
   );
 }
 export function useTermsOfUseSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    TermsOfUseQuery,
-    TermsOfUseQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<TermsOfUseQuery, TermsOfUseQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<TermsOfUseQuery, TermsOfUseQueryVariables>(
     TermsOfUseDocument,
     options
@@ -10145,9 +10124,14 @@ export function useUnitLazyQuery(
   );
 }
 export function useUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<UnitQuery, UnitQueryVariables>
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<UnitQuery, UnitQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<UnitQuery, UnitQueryVariables>(
     UnitDocument,
     options
@@ -10227,12 +10211,17 @@ export function useUnitWithSpacesAndResourcesLazyQuery(
   >(UnitWithSpacesAndResourcesDocument, options);
 }
 export function useUnitWithSpacesAndResourcesSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    UnitWithSpacesAndResourcesQuery,
-    UnitWithSpacesAndResourcesQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        UnitWithSpacesAndResourcesQuery,
+        UnitWithSpacesAndResourcesQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     UnitWithSpacesAndResourcesQuery,
     UnitWithSpacesAndResourcesQueryVariables
@@ -10323,12 +10312,17 @@ export function useHandlingDataLazyQuery(
   );
 }
 export function useHandlingDataSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    HandlingDataQuery,
-    HandlingDataQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        HandlingDataQuery,
+        HandlingDataQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<HandlingDataQuery, HandlingDataQueryVariables>(
     HandlingDataDocument,
     options
@@ -10401,12 +10395,17 @@ export function useBannerNotificationsAdminLazyQuery(
   >(BannerNotificationsAdminDocument, options);
 }
 export function useBannerNotificationsAdminSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsAdminQuery,
-    BannerNotificationsAdminQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsAdminQuery,
+        BannerNotificationsAdminQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsAdminQuery,
     BannerNotificationsAdminQueryVariables
@@ -10490,12 +10489,17 @@ export function useBannerNotificationsAdminListLazyQuery(
   >(BannerNotificationsAdminListDocument, options);
 }
 export function useBannerNotificationsAdminListSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsAdminListQuery,
-    BannerNotificationsAdminListQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsAdminListQuery,
+        BannerNotificationsAdminListQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsAdminListQuery,
     BannerNotificationsAdminListQueryVariables
@@ -10572,12 +10576,17 @@ export function useReservationDateOfBirthLazyQuery(
   >(ReservationDateOfBirthDocument, options);
 }
 export function useReservationDateOfBirthSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationDateOfBirthQuery,
-    ReservationDateOfBirthQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationDateOfBirthQuery,
+        ReservationDateOfBirthQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationDateOfBirthQuery,
     ReservationDateOfBirthQueryVariables
@@ -10654,12 +10663,17 @@ export function useApplicationDateOfBirthLazyQuery(
   >(ApplicationDateOfBirthDocument, options);
 }
 export function useApplicationDateOfBirthSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationDateOfBirthQuery,
-    ApplicationDateOfBirthQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationDateOfBirthQuery,
+        ApplicationDateOfBirthQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationDateOfBirthQuery,
     ApplicationDateOfBirthQueryVariables
@@ -10905,12 +10919,17 @@ export function useCheckPermissionsLazyQuery(
   >(CheckPermissionsDocument, options);
 }
 export function useCheckPermissionsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    CheckPermissionsQuery,
-    CheckPermissionsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        CheckPermissionsQuery,
+        CheckPermissionsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     CheckPermissionsQuery,
     CheckPermissionsQueryVariables
@@ -10986,12 +11005,17 @@ export function useReservationDenyReasonsLazyQuery(
   >(ReservationDenyReasonsDocument, options);
 }
 export function useReservationDenyReasonsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationDenyReasonsQuery,
-    ReservationDenyReasonsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationDenyReasonsQuery,
+        ReservationDenyReasonsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationDenyReasonsQuery,
     ReservationDenyReasonsQueryVariables
@@ -11081,12 +11105,17 @@ export function useReservationUnitsFilterParamsLazyQuery(
   >(ReservationUnitsFilterParamsDocument, options);
 }
 export function useReservationUnitsFilterParamsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitsFilterParamsQuery,
-    ReservationUnitsFilterParamsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitsFilterParamsQuery,
+        ReservationUnitsFilterParamsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitsFilterParamsQuery,
     ReservationUnitsFilterParamsQueryVariables
@@ -11165,12 +11194,17 @@ export function useReservationUnitTypesFilterLazyQuery(
   >(ReservationUnitTypesFilterDocument, options);
 }
 export function useReservationUnitTypesFilterSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitTypesFilterQuery,
-    ReservationUnitTypesFilterQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitTypesFilterQuery,
+        ReservationUnitTypesFilterQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitTypesFilterQuery,
     ReservationUnitTypesFilterQueryVariables
@@ -11250,12 +11284,17 @@ export function useUnitsFilterLazyQuery(
   );
 }
 export function useUnitsFilterSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    UnitsFilterQuery,
-    UnitsFilterQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        UnitsFilterQuery,
+        UnitsFilterQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<UnitsFilterQuery, UnitsFilterQueryVariables>(
     UnitsFilterDocument,
     options
@@ -11348,12 +11387,17 @@ export function useCurrentUserLazyQuery(
   );
 }
 export function useCurrentUserSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    CurrentUserQuery,
-    CurrentUserQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        CurrentUserQuery,
+        CurrentUserQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<CurrentUserQuery, CurrentUserQueryVariables>(
     CurrentUserDocument,
     options
@@ -11554,12 +11598,17 @@ export function useReservationUnitEditLazyQuery(
   >(ReservationUnitEditDocument, options);
 }
 export function useReservationUnitEditSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitEditQuery,
-    ReservationUnitEditQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitEditQuery,
+        ReservationUnitEditQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitEditQuery,
     ReservationUnitEditQueryVariables
@@ -11959,12 +12008,17 @@ export function useReservationUnitEditorParametersLazyQuery(
   >(ReservationUnitEditorParametersDocument, options);
 }
 export function useReservationUnitEditorParametersSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitEditorParametersQuery,
-    ReservationUnitEditorParametersQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitEditorParametersQuery,
+        ReservationUnitEditorParametersQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitEditorParametersQuery,
     ReservationUnitEditorParametersQueryVariables
@@ -12050,12 +12104,17 @@ export function useApplicationRoundFilterLazyQuery(
   >(ApplicationRoundFilterDocument, options);
 }
 export function useApplicationRoundFilterSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationRoundFilterQuery,
-    ApplicationRoundFilterQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationRoundFilterQuery,
+        ApplicationRoundFilterQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationRoundFilterQuery,
     ApplicationRoundFilterQueryVariables
@@ -12153,12 +12212,17 @@ export function useAllApplicationEventsLazyQuery(
   >(AllApplicationEventsDocument, options);
 }
 export function useAllApplicationEventsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    AllApplicationEventsQuery,
-    AllApplicationEventsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        AllApplicationEventsQuery,
+        AllApplicationEventsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     AllApplicationEventsQuery,
     AllApplicationEventsQueryVariables
@@ -12430,12 +12494,17 @@ export function useApplicationSectionAllocationsLazyQuery(
   >(ApplicationSectionAllocationsDocument, options);
 }
 export function useApplicationSectionAllocationsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationSectionAllocationsQuery,
-    ApplicationSectionAllocationsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationSectionAllocationsQuery,
+        ApplicationSectionAllocationsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationSectionAllocationsQuery,
     ApplicationSectionAllocationsQueryVariables
@@ -12579,12 +12648,17 @@ export function useApplicationRoundCriteriaLazyQuery(
   >(ApplicationRoundCriteriaDocument, options);
 }
 export function useApplicationRoundCriteriaSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationRoundCriteriaQuery,
-    ApplicationRoundCriteriaQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationRoundCriteriaQuery,
+        ApplicationRoundCriteriaQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationRoundCriteriaQuery,
     ApplicationRoundCriteriaQueryVariables
@@ -12730,12 +12804,17 @@ export function useRejectedOccurrencesLazyQuery(
   >(RejectedOccurrencesDocument, options);
 }
 export function useRejectedOccurrencesSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    RejectedOccurrencesQuery,
-    RejectedOccurrencesQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        RejectedOccurrencesQuery,
+        RejectedOccurrencesQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     RejectedOccurrencesQuery,
     RejectedOccurrencesQueryVariables
@@ -12914,12 +12993,17 @@ export function useApplicationsLazyQuery(
   );
 }
 export function useApplicationsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationsQuery,
-    ApplicationsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationsQuery,
+        ApplicationsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ApplicationsQuery, ApplicationsQueryVariables>(
     ApplicationsDocument,
     options
@@ -13068,12 +13152,17 @@ export function useApplicationSectionsLazyQuery(
   >(ApplicationSectionsDocument, options);
 }
 export function useApplicationSectionsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationSectionsQuery,
-    ApplicationSectionsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationSectionsQuery,
+        ApplicationSectionsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationSectionsQuery,
     ApplicationSectionsQueryVariables
@@ -13226,12 +13315,17 @@ export function useAllocatedTimeSlotsLazyQuery(
   >(AllocatedTimeSlotsDocument, options);
 }
 export function useAllocatedTimeSlotsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    AllocatedTimeSlotsQuery,
-    AllocatedTimeSlotsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        AllocatedTimeSlotsQuery,
+        AllocatedTimeSlotsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     AllocatedTimeSlotsQuery,
     AllocatedTimeSlotsQueryVariables
@@ -13308,12 +13402,17 @@ export function useApplicationRoundsLazyQuery(
   >(ApplicationRoundsDocument, options);
 }
 export function useApplicationRoundsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationRoundsQuery,
-    ApplicationRoundsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationRoundsQuery,
+        ApplicationRoundsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationRoundsQuery,
     ApplicationRoundsQueryVariables
@@ -13386,12 +13485,17 @@ export function useApplicationRoundLazyQuery(
   >(ApplicationRoundDocument, options);
 }
 export function useApplicationRoundSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationRoundQuery,
-    ApplicationRoundQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationRoundQuery,
+        ApplicationRoundQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationRoundQuery,
     ApplicationRoundQueryVariables
@@ -13465,12 +13569,17 @@ export function useApplicationAdminLazyQuery(
   >(ApplicationAdminDocument, options);
 }
 export function useApplicationAdminSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationAdminQuery,
-    ApplicationAdminQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationAdminQuery,
+        ApplicationAdminQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationAdminQuery,
     ApplicationAdminQueryVariables
@@ -13819,12 +13928,14 @@ export function useOptionsLazyQuery(
   );
 }
 export function useOptionsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    OptionsQuery,
-    OptionsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<OptionsQuery, OptionsQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<OptionsQuery, OptionsQueryVariables>(
     OptionsDocument,
     options
@@ -13900,12 +14011,14 @@ export function useUnitViewLazyQuery(
   );
 }
 export function useUnitViewSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    UnitViewQuery,
-    UnitViewQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<UnitViewQuery, UnitViewQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<UnitViewQuery, UnitViewQueryVariables>(
     UnitViewDocument,
     options
@@ -14018,12 +14131,17 @@ export function useReservationUnitsByUnitLazyQuery(
   >(ReservationUnitsByUnitDocument, options);
 }
 export function useReservationUnitsByUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitsByUnitQuery,
-    ReservationUnitsByUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitsByUnitQuery,
+        ReservationUnitsByUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitsByUnitQuery,
     ReservationUnitsByUnitQueryVariables
@@ -14096,12 +14214,17 @@ export function useReservationUnitLazyQuery(
   >(ReservationUnitDocument, options);
 }
 export function useReservationUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitQuery,
-    ReservationUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitQuery,
+        ReservationUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitQuery,
     ReservationUnitQueryVariables
@@ -14183,12 +14306,17 @@ export function useRecurringReservationUnitLazyQuery(
   >(RecurringReservationUnitDocument, options);
 }
 export function useRecurringReservationUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    RecurringReservationUnitQuery,
-    RecurringReservationUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        RecurringReservationUnitQuery,
+        RecurringReservationUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     RecurringReservationUnitQuery,
     RecurringReservationUnitQueryVariables
@@ -14283,12 +14411,17 @@ export function useReservationUnitCalendarLazyQuery(
   >(ReservationUnitCalendarDocument, options);
 }
 export function useReservationUnitCalendarSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitCalendarQuery,
-    ReservationUnitCalendarQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitCalendarQuery,
+        ReservationUnitCalendarQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitCalendarQuery,
     ReservationUnitCalendarQueryVariables
@@ -14437,12 +14570,17 @@ export function useReservationTimesInReservationUnitLazyQuery(
   >(ReservationTimesInReservationUnitDocument, options);
 }
 export function useReservationTimesInReservationUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationTimesInReservationUnitQuery,
-    ReservationTimesInReservationUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationTimesInReservationUnitQuery,
+        ReservationTimesInReservationUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationTimesInReservationUnitQuery,
     ReservationTimesInReservationUnitQueryVariables
@@ -14729,12 +14867,17 @@ export function useSearchReservationUnitsLazyQuery(
   >(SearchReservationUnitsDocument, options);
 }
 export function useSearchReservationUnitsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    SearchReservationUnitsQuery,
-    SearchReservationUnitsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        SearchReservationUnitsQuery,
+        SearchReservationUnitsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     SearchReservationUnitsQuery,
     SearchReservationUnitsQueryVariables
@@ -14822,12 +14965,17 @@ export function useReservationApplicationLinkLazyQuery(
   >(ReservationApplicationLinkDocument, options);
 }
 export function useReservationApplicationLinkSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationApplicationLinkQuery,
-    ReservationApplicationLinkQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationApplicationLinkQuery,
+        ReservationApplicationLinkQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationApplicationLinkQuery,
     ReservationApplicationLinkQueryVariables
@@ -14924,12 +15072,17 @@ export function useReservationsByReservationUnitLazyQuery(
   >(ReservationsByReservationUnitDocument, options);
 }
 export function useReservationsByReservationUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationsByReservationUnitQuery,
-    ReservationsByReservationUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationsByReservationUnitQuery,
+        ReservationsByReservationUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationsByReservationUnitQuery,
     ReservationsByReservationUnitQueryVariables
@@ -15014,12 +15167,17 @@ export function useReservationLazyQuery(
   );
 }
 export function useReservationSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationQuery,
-    ReservationQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationQuery,
+        ReservationQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ReservationQuery, ReservationQueryVariables>(
     ReservationDocument,
     options
@@ -15090,12 +15248,17 @@ export function useRecurringReservationLazyQuery(
   >(RecurringReservationDocument, options);
 }
 export function useRecurringReservationSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    RecurringReservationQuery,
-    RecurringReservationQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        RecurringReservationQuery,
+        RecurringReservationQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     RecurringReservationQuery,
     RecurringReservationQueryVariables
@@ -15387,12 +15550,14 @@ export function useSeriesPageLazyQuery(
   );
 }
 export function useSeriesPageSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    SeriesPageQuery,
-    SeriesPageQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<SeriesPageQuery, SeriesPageQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<SeriesPageQuery, SeriesPageQueryVariables>(
     SeriesPageDocument,
     options
@@ -15463,12 +15628,17 @@ export function useReservationSeriesLazyQuery(
   >(ReservationSeriesDocument, options);
 }
 export function useReservationSeriesSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationSeriesQuery,
-    ReservationSeriesQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationSeriesQuery,
+        ReservationSeriesQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationSeriesQuery,
     ReservationSeriesQueryVariables
@@ -15774,12 +15944,17 @@ export function useReservationsLazyQuery(
   );
 }
 export function useReservationsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationsQuery,
-    ReservationsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationsQuery,
+        ReservationsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ReservationsQuery, ReservationsQueryVariables>(
     ReservationsDocument,
     options
@@ -15974,9 +16149,14 @@ export function useUnitsLazyQuery(
   );
 }
 export function useUnitsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<UnitsQuery, UnitsQueryVariables>
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<UnitsQuery, UnitsQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<UnitsQuery, UnitsQueryVariables>(
     UnitsDocument,
     options
@@ -16146,12 +16326,14 @@ export function useResourceLazyQuery(
   );
 }
 export function useResourceSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ResourceQuery,
-    ResourceQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<ResourceQuery, ResourceQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ResourceQuery, ResourceQueryVariables>(
     ResourceDocument,
     options
@@ -16330,12 +16512,14 @@ export function useUnitSpacesLazyQuery(
   );
 }
 export function useUnitSpacesSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    UnitSpacesQuery,
-    UnitSpacesQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<UnitSpacesQuery, UnitSpacesQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<UnitSpacesQuery, UnitSpacesQueryVariables>(
     UnitSpacesDocument,
     options
@@ -16426,9 +16610,14 @@ export function useSpaceLazyQuery(
   );
 }
 export function useSpaceSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<SpaceQuery, SpaceQueryVariables>
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<SpaceQuery, SpaceQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<SpaceQuery, SpaceQueryVariables>(
     SpaceDocument,
     options
diff --git a/apps/admin-ui/src/i18n/messages.ts b/apps/admin-ui/src/i18n/messages.ts
index fd195682ed..c23bc1c74e 100644
--- a/apps/admin-ui/src/i18n/messages.ts
+++ b/apps/admin-ui/src/i18n/messages.ts
@@ -1334,10 +1334,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 +1414,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 +1700,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..de08d2e509 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/ImageEditor.tsx
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/ImageEditor.tsx
@@ -59,9 +59,22 @@ const FileInputContainer = styled.div`
   #file-input-helper {
     display: none;
   }
+
+  & 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);
+  }
 `;
 
-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..3142088ca0 100644
--- a/apps/admin-ui/src/spa/ReservationUnit/edit/PricingType.tsx
+++ b/apps/admin-ui/src/spa/ReservationUnit/edit/PricingType.tsx
@@ -1,19 +1,17 @@
 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 { fromUIDate } from "common/src/common/util";
+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 +25,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 +53,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 +69,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 +221,54 @@ 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 begins = fromUIDate(watch(`pricings.${index}.begins`));
+  // FIXME this doesn't work if using keyboard input
+  // we can set the date to past so it breaks the form
+  // need to add a boolean for it instead in the form data
+  const isFuture = begins == null || begins > new Date();
+  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)}
+          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 +280,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..ae6a4d65a8 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,72 @@ 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 past
+export function isInPast(date: string) {
+  const d = fromUIDate(date);
+  if (d == null) {
+    return false;
+  }
+  return d <= endOfDay(new Date());
+}
+
+/// @param date string in UI format
+/// @returns true if date is in the future
+export 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, this is used to control if we should show price section
+  isPaid: z.boolean(),
 });
 
 type PricingFormValues = z.infer<typeof PricingFormSchema>;
 
-const refinePricing = (
+// FIXME test this
+// also add the translated backend error messages (as toasts for now)
+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.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 +122,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 +137,7 @@ const refinePricing = (
       });
     }
   }
-};
+}
 
 const ImageFormSchema = z.object({
   pk: z.number().optional(),
@@ -215,10 +223,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 +257,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 +266,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 +657,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 +684,59 @@ 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,
     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;
+  while (pris.length < 2) {
+    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,
+      isPaid: false,
+      priceUnit: null,
+      begins,
+    });
+  }
+  return pris;
 }
 
 function convertImage(image?: Node["images"][0]): ImageFormType {
@@ -890,9 +888,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 +903,7 @@ export function convertReservationUnit(
   };
 }
 
+// TODO type
 export function transformReservationUnit(
   values: ReservationUnitEditFormValues
 ) {
@@ -946,9 +943,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 +995,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 d20fb064f3..21a14c0357 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,
@@ -71,6 +70,8 @@ import {
   convertReservationUnit,
   transformReservationUnit,
   type ImageFormType,
+  isInPast,
+  isInFuture,
 } from "./form";
 import { ButtonLikeLink } from "@/component/ButtonLikeLink";
 import { SeasonalSection } from "./SeasonalSection";
@@ -325,24 +326,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>
@@ -592,14 +594,13 @@ function BasicSection({
   const { errors } = formState;
   const { spaces } = unit ?? {};
 
-  const spaceOptions =
-    spaces?.map((s) => ({
-      label: String(s?.nameFi),
-      value: Number(s?.pk),
-    })) ?? [];
+  const spaceOptions = filterNonNullable(spaces).map((s) => ({
+    label: String(s?.nameFi),
+    value: Number(s?.pk),
+  }));
   const resourceOptions = filterNonNullable(
     spaces?.flatMap((s) => s?.resourceSet)
-  ).map((r) => ({ label: String(r?.nameFi), value: Number(r?.pk) }));
+  ).map((r) => ({ label: r.nameFi ?? "", value: r.pk ?? 0 }));
 
   const spacePks = watch("spaces");
   const selectedSpaces = filterNonNullable(
@@ -627,7 +628,6 @@ function BasicSection({
     >
       <AutoGrid>
         <RadioFieldGroup
-          id="reservationKind"
           heading={t("ReservationUnitEditor.label.reservationKind")}
           tooltip={t("ReservationUnitEditor.tooltip.reservationKind")}
         >
@@ -867,7 +867,6 @@ function ReservationUnitSettings({
           control={control}
           name="minReservationDuration"
           options={durationOptions}
-          placeholder={t("common.select")}
           style={{ gridColumnStart: "1" }}
           required
           label={t("ReservationUnitEditor.label.minReservationDuration")}
@@ -877,7 +876,6 @@ function ReservationUnitSettings({
         <ControlledSelect
           control={control}
           name="maxReservationDuration"
-          placeholder={t("common.select")}
           required
           options={durationOptions}
           label={t("ReservationUnitEditor.label.maxReservationDuration")}
@@ -888,7 +886,6 @@ function ReservationUnitSettings({
           control={control}
           name="reservationsMaxDaysBefore"
           options={reservationsMaxDaysBeforeOptions}
-          placeholder={t("common.select")}
           required
           label={t("ReservationUnitEditor.label.reservationsMaxDaysBefore")}
           error={getTranslatedError(
@@ -907,7 +904,6 @@ function ReservationUnitSettings({
         <ControlledSelect
           control={control}
           name="reservationStartInterval"
-          placeholder={t("common.select")}
           options={reservationStartIntervalOptions}
           required
           error={getTranslatedError(
@@ -1092,46 +1088,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) => isInPast(p.begins))
+          .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"
@@ -1139,31 +1129,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) => isInFuture(p.begins))
+            .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" }}>
@@ -1189,7 +1178,6 @@ function PricingSection({
             control={control}
             name="pricingTerms"
             label={t("ReservationUnitEditor.label.pricingTerms")}
-            placeholder={t("common.select")}
             required
             clearable
             options={pricingTermsOptions}
@@ -1197,7 +1185,7 @@ function PricingSection({
             tooltip={t("ReservationUnitEditor.tooltip.pricingTerms")}
           />
         )}
-      </VerticalFlex>
+      </AutoGrid>
     </Accordion>
   );
 }
@@ -1397,19 +1385,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}
@@ -1418,7 +1407,7 @@ function OpeningHoursSection({
             fontSize="small"
             rel="noopener noreferrer"
           >
-            {t("ReservationUnitEditor.openingTimesExternalLink")}
+            {t("openingTimesExternalLink")}
             <IconLinkExternal style={{ marginLeft: "var(--spacing-xs)" }} />
           </ButtonLikeLink>
           <ButtonLikeLink
@@ -1428,12 +1417,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>
   );
@@ -1459,27 +1448,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 =
@@ -1680,8 +1669,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,
diff --git a/apps/admin-ui/src/spa/reservations/[id]/index.tsx b/apps/admin-ui/src/spa/reservations/[id]/index.tsx
index addb423610..a62603e2d2 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?.reservationUnit?.[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 defc1c114f..beffa73f74 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,
@@ -18,25 +16,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,
@@ -68,16 +84,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 430d0d9ee1..a09c670367 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["reservationUnit"]>[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.reservationUnit?.[0],
-    reservation.begin
-  );
+  const begin = new Date(reservation.begin);
+  const end = new Date(reservation.end);
+  const resUnit = reservation.reservationUnit?.[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..15603acc03 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,
@@ -98,6 +102,7 @@ export const AutoGrid = styled.div<{ $minWidth?: string; $largeGap?: boolean }>`
   gap: ${({ $largeGap }) =>
       $largeGap ? " var(--spacing-xl)" : "var(--spacing-m)"}
     var(--spacing-m);
+  align-items: ${({ $alignCenter }) => ($alignCenter ? "center" : "baseline")};
 `;
 AutoGrid.displayName = "AutoGrid";
 
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 4c3c3ce001..31eb3e6d83 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 6bee5103f1..fb43f5ed3f 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 281d614dd3..bea2ac0359 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 03f9ca23ec..34b3cd33db 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",
@@ -3545,7 +3537,6 @@ export enum ReservationTypeStaffChoice {
 }
 
 export type ReservationUnitCancellationRuleNode = Node & {
-  /** Seconds before reservations related to this cancellation rule can be cancelled without handling. */
   canBeCancelledTimeBefore?: Maybe<Scalars["Duration"]["output"]>;
   /** The ID of the object */
   id: Scalars["ID"]["output"];
@@ -4081,44 +4072,27 @@ export type ReservationUnitPaymentTypeNode = Node & {
 };
 
 export type ReservationUnitPricingNode = Node & {
-  /** When pricing is activated */
   begins: Scalars["Date"]["output"];
-  /** Maximum price of the reservation unit including VAT */
   highestPrice: Scalars["Decimal"]["output"];
   highestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   /** The ID of the object */
   id: Scalars["ID"]["output"];
-  /** Minimum price of the reservation unit including VAT */
   lowestPrice: Scalars["Decimal"]["output"];
   lowestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** Unit of the price */
   priceUnit: PriceUnit;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: Maybe<PricingType>;
-  /** Status of the pricing */
-  status: Status;
-  /** The percentage of tax included in the price */
   taxPercentage: TaxPercentageNode;
 };
 
 export type ReservationUnitPricingSerializerInput = {
-  /** When pricing is activated */
   begins: Scalars["Date"]["input"];
-  /** Maximum price of the reservation unit including VAT */
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
-  /** Minimum price of the reservation unit including VAT */
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Unit of the price */
   priceUnit?: InputMaybe<PriceUnit>;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: InputMaybe<PricingType>;
-  /** Status of the pricing */
-  status: Status;
-  /** The percentage of tax included in the price */
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -4150,7 +4124,6 @@ export type ReservationUnitTypeNode = Node & {
   nameFi?: Maybe<Scalars["String"]["output"]>;
   nameSv?: Maybe<Scalars["String"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** Järjestysnumero, jota käytetään rajapinnan järjestämisessä. */
   rank?: Maybe<Scalars["Int"]["output"]>;
 };
 
@@ -4753,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 & {
@@ -4791,7 +4772,6 @@ export type TaxPercentageNode = Node & {
   /** The ID of the object */
   id: Scalars["ID"]["output"];
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** The tax percentage for a price */
   value: Scalars["Decimal"]["output"];
 };
 
@@ -5250,22 +5230,14 @@ export type UpdateReservationUnitOptionApplicantSerializerInput = {
 };
 
 export type UpdateReservationUnitPricingSerializerInput = {
-  /** When pricing is activated */
   begins?: InputMaybe<Scalars["Date"]["input"]>;
-  /** Maximum price of the reservation unit including VAT */
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
-  /** Minimum price of the reservation unit including VAT */
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Unit of the price */
   priceUnit?: InputMaybe<PriceUnit>;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: InputMaybe<PricingType>;
-  /** Status of the pricing */
-  status?: InputMaybe<Status>;
-  /** The percentage of tax included in the price */
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -5391,10 +5363,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 };
     }>;
   }>;
@@ -5759,10 +5729,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<{
@@ -5962,10 +5930,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 };
           }>;
         }>;
@@ -6113,10 +6079,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<{
@@ -6370,10 +6334,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?: {
@@ -6533,10 +6495,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?: {
@@ -6736,10 +6696,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?: {
@@ -6869,10 +6827,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?: {
@@ -6968,10 +6924,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;
@@ -6999,10 +6953,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 };
   }>;
 };
@@ -7613,10 +7565,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 };
 };
 
@@ -7695,7 +7645,6 @@ export const PricingFieldsFragmentDoc = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -7703,7 +7652,6 @@ export const PricingFieldsFragmentDoc = gql`
       pk
       value
     }
-    status
   }
 `;
 export const PriceReservationUnitFragmentDoc = gql`
@@ -8452,12 +8400,14 @@ export function useOptionsLazyQuery(
   );
 }
 export function useOptionsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    OptionsQuery,
-    OptionsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<OptionsQuery, OptionsQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<OptionsQuery, OptionsQueryVariables>(
     OptionsDocument,
     options
@@ -8548,12 +8498,17 @@ export function useApplicationsLazyQuery(
   );
 }
 export function useApplicationsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationsQuery,
-    ApplicationsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationsQuery,
+        ApplicationsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ApplicationsQuery, ApplicationsQueryVariables>(
     ApplicationsDocument,
     options
@@ -8833,12 +8788,17 @@ export function useApplicationRoundPeriodsLazyQuery(
   >(ApplicationRoundPeriodsDocument, options);
 }
 export function useApplicationRoundPeriodsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationRoundPeriodsQuery,
-    ApplicationRoundPeriodsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationRoundPeriodsQuery,
+        ApplicationRoundPeriodsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationRoundPeriodsQuery,
     ApplicationRoundPeriodsQueryVariables
@@ -8911,12 +8871,17 @@ export function useApplicationRoundsUiLazyQuery(
   >(ApplicationRoundsUiDocument, options);
 }
 export function useApplicationRoundsUiSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationRoundsUiQuery,
-    ApplicationRoundsUiQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationRoundsUiQuery,
+        ApplicationRoundsUiQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ApplicationRoundsUiQuery,
     ApplicationRoundsUiQueryVariables
@@ -9008,12 +8973,17 @@ export function useSearchFormParamsUnitLazyQuery(
   >(SearchFormParamsUnitDocument, options);
 }
 export function useSearchFormParamsUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    SearchFormParamsUnitQuery,
-    SearchFormParamsUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        SearchFormParamsUnitQuery,
+        SearchFormParamsUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     SearchFormParamsUnitQuery,
     SearchFormParamsUnitQueryVariables
@@ -9090,12 +9060,17 @@ export function useReservationUnitPurposesLazyQuery(
   >(ReservationUnitPurposesDocument, options);
 }
 export function useReservationUnitPurposesSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitPurposesQuery,
-    ReservationUnitPurposesQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitPurposesQuery,
+        ReservationUnitPurposesQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitPurposesQuery,
     ReservationUnitPurposesQueryVariables
@@ -9469,12 +9444,17 @@ export function useListReservationsLazyQuery(
   >(ListReservationsDocument, options);
 }
 export function useListReservationsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ListReservationsQuery,
-    ListReservationsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ListReservationsQuery,
+        ListReservationsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ListReservationsQuery,
     ListReservationsQueryVariables
@@ -9584,12 +9564,17 @@ export function useReservationLazyQuery(
   );
 }
 export function useReservationSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationQuery,
-    ReservationQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationQuery,
+        ReservationQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ReservationQuery, ReservationQueryVariables>(
     ReservationDocument,
     options
@@ -9662,12 +9647,17 @@ export function useReservationCancelReasonsLazyQuery(
   >(ReservationCancelReasonsDocument, options);
 }
 export function useReservationCancelReasonsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationCancelReasonsQuery,
-    ReservationCancelReasonsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationCancelReasonsQuery,
+        ReservationCancelReasonsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationCancelReasonsQuery,
     ReservationCancelReasonsQueryVariables
@@ -9788,9 +9778,14 @@ export function useOrderLazyQuery(
   );
 }
 export function useOrderSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<OrderQuery, OrderQueryVariables>
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<OrderQuery, OrderQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<OrderQuery, OrderQueryVariables>(
     OrderDocument,
     options
@@ -9910,12 +9905,17 @@ export function useReservationUnitLazyQuery(
   >(ReservationUnitDocument, options);
 }
 export function useReservationUnitSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitQuery,
-    ReservationUnitQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitQuery,
+        ReservationUnitQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitQuery,
     ReservationUnitQueryVariables
@@ -10009,12 +10009,17 @@ export function useReservationUnitPageLazyQuery(
   >(ReservationUnitPageDocument, options);
 }
 export function useReservationUnitPageSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ReservationUnitPageQuery,
-    ReservationUnitPageQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ReservationUnitPageQuery,
+        ReservationUnitPageQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ReservationUnitPageQuery,
     ReservationUnitPageQueryVariables
@@ -10170,12 +10175,17 @@ export function useSearchReservationUnitsLazyQuery(
   >(SearchReservationUnitsDocument, options);
 }
 export function useSearchReservationUnitsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    SearchReservationUnitsQuery,
-    SearchReservationUnitsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        SearchReservationUnitsQuery,
+        SearchReservationUnitsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     SearchReservationUnitsQuery,
     SearchReservationUnitsQueryVariables
@@ -10276,12 +10286,17 @@ export function useRelatedReservationUnitsLazyQuery(
   >(RelatedReservationUnitsDocument, options);
 }
 export function useRelatedReservationUnitsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    RelatedReservationUnitsQuery,
-    RelatedReservationUnitsQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        RelatedReservationUnitsQuery,
+        RelatedReservationUnitsQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     RelatedReservationUnitsQuery,
     RelatedReservationUnitsQueryVariables
@@ -10353,12 +10368,17 @@ export function useCurrentUserLazyQuery(
   );
 }
 export function useCurrentUserSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    CurrentUserQuery,
-    CurrentUserQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        CurrentUserQuery,
+        CurrentUserQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<CurrentUserQuery, CurrentUserQueryVariables>(
     CurrentUserDocument,
     options
@@ -10428,12 +10448,17 @@ export function useBannerNotificationsListAllLazyQuery(
   >(BannerNotificationsListAllDocument, options);
 }
 export function useBannerNotificationsListAllSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsListAllQuery,
-    BannerNotificationsListAllQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsListAllQuery,
+        BannerNotificationsListAllQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsListAllQuery,
     BannerNotificationsListAllQueryVariables
@@ -10510,12 +10535,17 @@ export function useBannerNotificationsListLazyQuery(
   >(BannerNotificationsListDocument, options);
 }
 export function useBannerNotificationsListSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsListQuery,
-    BannerNotificationsListQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsListQuery,
+        BannerNotificationsListQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsListQuery,
     BannerNotificationsListQueryVariables
@@ -10599,12 +10629,17 @@ export function useApplicationLazyQuery(
   );
 }
 export function useApplicationSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationQuery,
-    ApplicationQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationQuery,
+        ApplicationQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ApplicationQuery, ApplicationQueryVariables>(
     ApplicationDocument,
     options
@@ -10676,12 +10711,14 @@ export function useTermsOfUseLazyQuery(
   );
 }
 export function useTermsOfUseSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    TermsOfUseQuery,
-    TermsOfUseQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<TermsOfUseQuery, TermsOfUseQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<TermsOfUseQuery, TermsOfUseQueryVariables>(
     TermsOfUseDocument,
     options
diff --git a/apps/ui/modules/__tests__/reservationUnit.test.ts b/apps/ui/modules/__tests__/reservationUnit.test.ts
index 4d2861e777..c23fe1418e 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,6 +42,7 @@ 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 { TFunction } from "i18next";
 
 jest.mock("next-i18next", () => ({
   i18n: {
@@ -220,6 +219,7 @@ describe("getPriceString", () => {
     minutes?: number;
   }): GetPriceType {
     return {
+      t: ((str: string) => str) as TFunction,
       pricing: constructPricing({
         lowestPrice,
         highestPrice,
@@ -867,8 +867,6 @@ describe("getFuturePricing", () => {
           begins: date,
           lowestPrice: 0,
           highestPrice: 10,
-          status: Status.Future,
-          pricingType: PricingType.Paid,
         })
       ),
     };
@@ -894,13 +892,6 @@ 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();
   });
 
@@ -993,23 +984,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 +1003,6 @@ function constructPricing({
       id: "1",
       value: (taxPercentage ?? 24).toString(),
     },
-    status: status ?? Status.Future,
   };
 }
 
@@ -1038,6 +1023,7 @@ describe("getReservationUnitPrice", () => {
     date: Date;
   }): GetReservationUnitPriceProps {
     return {
+      t: ((str: string) => str) as TFunction,
       pricingDate: date,
       reservationUnit: {
         pricings: [
@@ -1064,7 +1050,6 @@ describe("getReservationUnitPrice", () => {
             lowestPrice: 0,
             highestPrice: 10,
             taxPercentage: 24,
-            status: Status.Active,
           }),
         ],
       },
@@ -1083,19 +1068,18 @@ describe("getReservationUnitPrice", () => {
     const date = addDays(new Date(), 15);
     const input = {
       pricingDate: date,
+      t: ((str: string) => str) 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 +1089,17 @@ describe("getReservationUnitPrice", () => {
   test("future change in tax for free uses future price", () => {
     const date = addDays(new Date(), 15);
     const input = {
+      t: ((str: string) => str) 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,
           }),
         ],
       },
@@ -1133,13 +1115,11 @@ describe("isReservationUnitPaidInFuture", () => {
         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,
       }),
     ];
 
@@ -1152,14 +1132,11 @@ describe("isReservationUnitPaidInFuture", () => {
         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,
       }),
     ];
 
@@ -1172,14 +1149,11 @@ describe("isReservationUnitPaidInFuture", () => {
         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,
       }),
     ];
 
@@ -1192,14 +1166,11 @@ describe("isReservationUnitPaidInFuture", () => {
         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,
       }),
     ];
 
@@ -1212,15 +1183,11 @@ describe("isReservationUnitPaidInFuture", () => {
         begins: addDays(new Date(), 10),
         lowestPrice: 0,
         highestPrice: 20,
-        status: Status.Future,
-        pricingType: PricingType.Free,
       }),
       constructPricing({
         begins: addDays(new Date(), 20),
         lowestPrice: 0,
         highestPrice: 20,
-        status: Status.Active,
-        pricingType: PricingType.Free,
       }),
     ];
 
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 197bbc46dc..16b65ddfe3 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 6b4bab8328..4aa910316a 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",
@@ -3545,7 +3537,6 @@ export enum ReservationTypeStaffChoice {
 }
 
 export type ReservationUnitCancellationRuleNode = Node & {
-  /** Seconds before reservations related to this cancellation rule can be cancelled without handling. */
   canBeCancelledTimeBefore?: Maybe<Scalars["Duration"]["output"]>;
   /** The ID of the object */
   id: Scalars["ID"]["output"];
@@ -4081,44 +4072,27 @@ export type ReservationUnitPaymentTypeNode = Node & {
 };
 
 export type ReservationUnitPricingNode = Node & {
-  /** When pricing is activated */
   begins: Scalars["Date"]["output"];
-  /** Maximum price of the reservation unit including VAT */
   highestPrice: Scalars["Decimal"]["output"];
   highestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   /** The ID of the object */
   id: Scalars["ID"]["output"];
-  /** Minimum price of the reservation unit including VAT */
   lowestPrice: Scalars["Decimal"]["output"];
   lowestPriceNet?: Maybe<Scalars["Decimal"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** Unit of the price */
   priceUnit: PriceUnit;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: Maybe<PricingType>;
-  /** Status of the pricing */
-  status: Status;
-  /** The percentage of tax included in the price */
   taxPercentage: TaxPercentageNode;
 };
 
 export type ReservationUnitPricingSerializerInput = {
-  /** When pricing is activated */
   begins: Scalars["Date"]["input"];
-  /** Maximum price of the reservation unit including VAT */
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
-  /** Minimum price of the reservation unit including VAT */
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Unit of the price */
   priceUnit?: InputMaybe<PriceUnit>;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: InputMaybe<PricingType>;
-  /** Status of the pricing */
-  status: Status;
-  /** The percentage of tax included in the price */
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -4150,7 +4124,6 @@ export type ReservationUnitTypeNode = Node & {
   nameFi?: Maybe<Scalars["String"]["output"]>;
   nameSv?: Maybe<Scalars["String"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** Järjestysnumero, jota käytetään rajapinnan järjestämisessä. */
   rank?: Maybe<Scalars["Int"]["output"]>;
 };
 
@@ -4753,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 & {
@@ -4791,7 +4772,6 @@ export type TaxPercentageNode = Node & {
   /** The ID of the object */
   id: Scalars["ID"]["output"];
   pk?: Maybe<Scalars["Int"]["output"]>;
-  /** The tax percentage for a price */
   value: Scalars["Decimal"]["output"];
 };
 
@@ -5250,22 +5230,14 @@ export type UpdateReservationUnitOptionApplicantSerializerInput = {
 };
 
 export type UpdateReservationUnitPricingSerializerInput = {
-  /** When pricing is activated */
   begins?: InputMaybe<Scalars["Date"]["input"]>;
-  /** Maximum price of the reservation unit including VAT */
   highestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   highestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
-  /** Minimum price of the reservation unit including VAT */
+  isActivatedOnBegins?: InputMaybe<Scalars["Boolean"]["input"]>;
   lowestPrice?: InputMaybe<Scalars["Decimal"]["input"]>;
   lowestPriceNet?: InputMaybe<Scalars["String"]["input"]>;
   pk?: InputMaybe<Scalars["Int"]["input"]>;
-  /** Unit of the price */
   priceUnit?: InputMaybe<PriceUnit>;
-  /** What kind of pricing types are available with this reservation unit. */
-  pricingType?: InputMaybe<PricingType>;
-  /** Status of the pricing */
-  status?: InputMaybe<Status>;
-  /** The percentage of tax included in the price */
   taxPercentage?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
@@ -5954,10 +5926,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 };
 };
 
@@ -6296,7 +6266,6 @@ export const PricingFieldsFragmentDoc = gql`
     id
     begins
     priceUnit
-    pricingType
     lowestPrice
     highestPrice
     taxPercentage {
@@ -6304,7 +6273,6 @@ export const PricingFieldsFragmentDoc = gql`
       pk
       value
     }
-    status
   }
 `;
 export const LocationFieldsFragmentDoc = gql`
@@ -6407,12 +6375,17 @@ export function useBannerNotificationsListAllLazyQuery(
   >(BannerNotificationsListAllDocument, options);
 }
 export function useBannerNotificationsListAllSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsListAllQuery,
-    BannerNotificationsListAllQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsListAllQuery,
+        BannerNotificationsListAllQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsListAllQuery,
     BannerNotificationsListAllQueryVariables
@@ -6489,12 +6462,17 @@ export function useBannerNotificationsListLazyQuery(
   >(BannerNotificationsListDocument, options);
 }
 export function useBannerNotificationsListSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    BannerNotificationsListQuery,
-    BannerNotificationsListQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        BannerNotificationsListQuery,
+        BannerNotificationsListQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     BannerNotificationsListQuery,
     BannerNotificationsListQueryVariables
@@ -6578,12 +6556,17 @@ export function useApplicationLazyQuery(
   );
 }
 export function useApplicationSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    ApplicationQuery,
-    ApplicationQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<
+        ApplicationQuery,
+        ApplicationQueryVariables
+      >
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ApplicationQuery, ApplicationQueryVariables>(
     ApplicationDocument,
     options
@@ -6655,12 +6638,14 @@ export function useTermsOfUseLazyQuery(
   );
 }
 export function useTermsOfUseSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    TermsOfUseQuery,
-    TermsOfUseQueryVariables
-  >
+  baseOptions?:
+    | Apollo.SkipToken
+    | Apollo.SuspenseQueryHookOptions<TermsOfUseQuery, TermsOfUseQueryVariables>
 ) {
-  const options = { ...defaultOptions, ...baseOptions };
+  const options =
+    baseOptions === Apollo.skipToken
+      ? baseOptions
+      : { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<TermsOfUseQuery, TermsOfUseQueryVariables>(
     TermsOfUseDocument,
     options
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..1c370c4edf 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, "lowestPrice">
+): boolean {
+  const price = toNumber(pricing.lowestPrice);
+  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 21f0662951..87d3277dd2 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.
 """
@@ -3917,9 +3903,6 @@ enum ReservationTypeStaffChoice {
 }
 
 type ReservationUnitCancellationRuleNode implements Node {
-  """
-  Seconds before reservations related to this cancellation rule can be cancelled without handling.
-  """
   canBeCancelledTimeBefore: Duration
   """
   The ID of the object
@@ -4485,74 +4468,29 @@ type ReservationUnitPaymentTypeNode implements Node {
 }
 
 type ReservationUnitPricingNode implements Node {
-  """
-  When pricing is activated
-  """
   begins: Date!
-  """
-  Maximum price of the reservation unit including VAT
-  """
   highestPrice: Decimal!
   highestPriceNet: Decimal
   """
   The ID of the object
   """
   id: ID!
-  """
-  Minimum price of the reservation unit including VAT
-  """
   lowestPrice: Decimal!
   lowestPriceNet: Decimal
   pk: Int
-  """
-  Unit of the price
-  """
   priceUnit: PriceUnit!
-  """
-  What kind of pricing types are available with this reservation unit.
-  """
-  pricingType: PricingType
-  """
-  Status of the pricing
-  """
-  status: Status!
-  """
-  The percentage of tax included in the price
-  """
   taxPercentage: TaxPercentageNode!
 }
 
 input ReservationUnitPricingSerializerInput {
-  """
-  When pricing is activated
-  """
   begins: Date!
-  """
-  Maximum price of the reservation unit including VAT
-  """
   highestPrice: Decimal
   highestPriceNet: String
-  """
-  Minimum price of the reservation unit including VAT
-  """
+  isActivatedOnBegins: Boolean
   lowestPrice: Decimal
   lowestPriceNet: String
   pk: Int
-  """
-  Unit of the price
-  """
   priceUnit: PriceUnit
-  """
-  What kind of pricing types are available with this reservation unit.
-  """
-  pricingType: PricingType
-  """
-  Status of the pricing
-  """
-  status: Status!
-  """
-  The percentage of tax included in the price
-  """
   taxPercentage: Int
 }
 
@@ -4590,9 +4528,6 @@ type ReservationUnitTypeNode implements Node {
   nameFi: String
   nameSv: String
   pk: Int
-  """
-  Järjestysnumero, jota käytetään rajapinnan järjestämisessä.
-  """
   rank: Int
 }
 
@@ -5276,17 +5211,33 @@ An enumeration.
 """
 enum Status {
   """
-  aktiivinen
+  Peruttu
   """
-  ACTIVE
+  CANCELLED
   """
-  tuleva
+  Luonnos
   """
-  FUTURE
+  DRAFT
   """
-  mennyt
+  Rauennut
+  """
+  EXPIRED
+  """
+  Käsitelty
+  """
+  HANDLED
+  """
+  Käsittelyssä
+  """
+  IN_ALLOCATION
+  """
+  Vastaanotettu
+  """
+  RECEIVED
   """
-  PAST
+  Päätökset lähetetty
+  """
+  RESULT_SENT
 }
 
 type SuitableTimeRangeNode implements Node {
@@ -5325,9 +5276,6 @@ type TaxPercentageNode implements Node {
   """
   id: ID!
   pk: Int
-  """
-  The tax percentage for a price
-  """
   value: Decimal!
 }
 
@@ -5861,36 +5809,14 @@ input UpdateReservationUnitOptionApplicantSerializerInput {
 }
 
 input UpdateReservationUnitPricingSerializerInput {
-  """
-  When pricing is activated
-  """
   begins: Date
-  """
-  Maximum price of the reservation unit including VAT
-  """
   highestPrice: Decimal
   highestPriceNet: String
-  """
-  Minimum price of the reservation unit including VAT
-  """
+  isActivatedOnBegins: Boolean
   lowestPrice: Decimal
   lowestPriceNet: String
   pk: Int
-  """
-  Unit of the price
-  """
   priceUnit: PriceUnit
-  """
-  What kind of pricing types are available with this reservation unit.
-  """
-  pricingType: PricingType
-  """
-  Status of the pricing
-  """
-  status: Status
-  """
-  The percentage of tax included in the price
-  """
   taxPercentage: Int
 }