@stigg/react-sdk 4.13.2 → 4.14.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.13.2",
+  "version": "4.14.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -112,7 +112,7 @@
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mui/material": "^5.12.0",
-    "@stigg/js-client-sdk": "2.24.6",
+    "@stigg/js-client-sdk": "2.25.0",
     "@stripe/react-stripe-js": "^2.1.1",
     "@stripe/stripe-js": "^1.54.1",
     "@types/styled-components": "^5.1.26",

package/src/components/checkout/hooks/usePlanStepModel.ts

@@ -1,6 +1,6 @@
 import keyBy from 'lodash/keyBy';
 import compact from 'lodash/compact';
-import { BillableFeatureInput, BillingPeriod } from '@stigg/api-client-js/src/generated/sdk';
+import { BillableFeatureInput, BillingPeriod, TiersMode } from '@stigg/api-client-js/src/generated/sdk';
 import { BillableFeature, BillingModel, Plan, Price, Subscription } from '@stigg/js-client-sdk';
 import { useCheckoutContext } from '../CheckoutProvider';
 import { getTierByQuantity } from '../../utils/priceTierUtils';
@@ -73,9 +73,9 @@ function getBillableFeatures(
 
       quantity = getValidPriceQuantity(price, preconfiguredQuantity || 1);
 
-      if (price.isTieredPrice) {
+      if (price.isTieredPrice && price.tiersMode === TiersMode.Volume) {
         const tier = getTierByQuantity(price.tiers!, quantity);
-        quantity = tier!.upTo;
+        quantity = tier!.upTo!;
       }
 
       return {

package/src/components/checkout/steps/plan/CheckoutChargeList.tsx

@@ -103,7 +103,7 @@ export function PlanCharge({
     if (isPayAsYouGo) {
       chargeRow += ' / unit';
     }
-  } else if (charge.isTieredPrice && featureId) {
+  } else if (charge.isTieredPrice && charge.tiersMode && featureId) {
     const tier = getTierByQuantity(charge.tiers!, billableFeature!.quantity || 1);
     chargeRow = (
       <TiersSelectContainer
@@ -111,8 +111,16 @@ export function PlanCharge({
         tiers={charge.tiers}
         selectedTier={tier}
         handleTierChange={(tier: PriceTierFragment) => {
-          setBillableFeature(featureId, tier.upTo);
+          if (tier.upTo) {
+            setBillableFeature(featureId, tier.upTo);
+          }
         }}
+        tiersMode={charge.tiersMode}
+        perUnitQuantity={billableFeature?.quantity}
+        handlePerUnitQuantityChange={(quantity: number) => {
+          setBillableFeature(featureId, quantity);
+        }}
+        width={120}
       />
     );
   } else {

package/src/components/common/TiersSelectContainer.tsx

@@ -1,78 +1,49 @@
-import { PriceTierFragment } from '@stigg/js-client-sdk';
-import MenuItem from '@mui/material/MenuItem';
-import OutlinedInput from '@mui/material/OutlinedInput';
-import Select, { SelectChangeEvent } from '@mui/material/Select';
-import { map } from 'lodash';
-import React, { ReactNode } from 'react';
+import { PriceTierFragment, TiersMode } from '@stigg/js-client-sdk';
+import React from 'react';
 import styled from '@emotion/styled/macro';
 import { getTierByQuantity } from '../utils/priceTierUtils';
 import { Typography } from './Typography';
+import { VolumePerUnitInput } from './VolumePerUnitInput';
+import { VolumeBulkSelect } from './VolumeBulkSelect';
 
-const TierSelect = styled(Select)`
-  border-radius: 10px;
-  min-height: 42px;
-  min-width: 120px;
-
-  &:hover .MuiOutlinedInput-notchedOutline {
-    border-color: ${({ theme }) => theme.stigg.palette.outlinedBorder};
-  }
-`;
-
-const TierInput = styled(OutlinedInput)`
-  & .MuiInputBase-input {
-    padding: 10px 12px;
-  }
-
-  &.Mui-focused .MuiOutlinedInput-notchedOutline {
-    border-color: ${({ theme }) => theme.stigg.palette.primary} !important;
-  }
-`;
-
-export function TiersSelectContainer({
-  componentId,
-  tiers,
-  tierUnits,
-  selectedTier,
-  handleTierChange,
-}: {
+export type TiersSelectContainerProps = {
   componentId: string;
   tiers?: PriceTierFragment[] | null;
   tierUnits?: string;
   selectedTier?: PriceTierFragment;
   handleTierChange: (tier: PriceTierFragment) => void;
-}) {
-  const handleChange = (event: SelectChangeEvent<unknown>, _: ReactNode) => {
+  tiersMode?: TiersMode | null;
+  handlePerUnitQuantityChange: (quantity: number) => void;
+  perUnitQuantity?: number;
+  width?: number;
+};
+
+const TiersSelectLayout = styled(Typography)`
+  min-height: 46px;
+`;
+
+export function TiersSelectContainer(props: TiersSelectContainerProps) {
+  const { tiers, tiersMode, handleTierChange } = props;
+  const handleChange = (quantity: number) => {
     if (!tiers) return;
 
-    handleTierChange(getTierByQuantity(tiers, event.target.value as number)!);
+    handleTierChange(getTierByQuantity(tiers, quantity)!);
+  };
+
+  const getContent = () => {
+    switch (tiersMode) {
+      case TiersMode.VolumePerUnit:
+        return <VolumePerUnitInput handleChange={handleChange} {...props} />;
+      case TiersMode.Volume:
+        return <VolumeBulkSelect handleChange={handleChange} {...props} />;
+      default:
+        return <div />;
+    }
   };
 
   return (
-    <Typography as="div" className="stigg-price-tier-select" style={{ minHeight: '46px' }}>
-      {tiers ? (
-        <TierSelect
-          value={selectedTier ? selectedTier.upTo.toString() : tiers[0].upTo.toString()}
-          fullWidth
-          onChange={handleChange}
-          id={componentId}
-          input={<TierInput />}
-          MenuProps={{
-            MenuListProps: { disablePadding: true },
-            PaperProps: {
-              sx: { marginTop: '4px', borderRadius: '10px' },
-            },
-          }}>
-          {map(tiers, (tier: PriceTierFragment) => (
-            <MenuItem className="stigg-price-tier-menu-item-text" key={tier.upTo} value={tier.upTo.toString()}>
-              <Typography variant="body1" color="primary" style={{ lineHeight: 'unset' }}>
-                {tier.upTo} {tierUnits}
-              </Typography>
-            </MenuItem>
-          ))}
-        </TierSelect>
-      ) : (
-        <div />
-      )}
-    </Typography>
+    <TiersSelectLayout as="div" className="stigg-price-tier-select">
+      {getContent()}
+    </TiersSelectLayout>
   );
 }

package/src/components/common/VolumeBulkSelect.tsx

@@ -0,0 +1,68 @@
+import { PriceTierFragment } from '@stigg/js-client-sdk';
+import styled from '@emotion/styled/macro';
+import OutlinedInput from '@mui/material/OutlinedInput';
+import Select from '@mui/material/Select';
+import MenuItem from '@mui/material/MenuItem';
+import { map } from 'lodash';
+import React from 'react';
+import { Typography } from './Typography';
+import { TiersSelectContainerProps } from './TiersSelectContainer';
+
+const TierSelect = styled(Select)`
+  border-radius: 10px;
+  min-height: 42px;
+  min-width: 120px;
+
+  &:hover .MuiOutlinedInput-notchedOutline {
+    border-color: ${({ theme }) => theme.stigg.palette.outlinedBorder};
+  }
+`;
+
+const TierInput = styled(OutlinedInput)`
+  & .MuiInputBase-input {
+    padding: 10px 12px;
+  }
+
+  &.Mui-focused .MuiOutlinedInput-notchedOutline {
+    border-color: ${({ theme }) => theme.stigg.palette.primary} !important;
+  }
+`;
+
+export function VolumeBulkSelect({
+  selectedTier,
+  componentId,
+  tierUnits,
+  tiers,
+  handleChange,
+}: Pick<TiersSelectContainerProps, 'selectedTier' | 'componentId' | 'tiers' | 'tierUnits'> & {
+  handleChange: (quantity: number) => void;
+}) {
+  if (!tiers) {
+    return null;
+  }
+
+  return (
+    <TierSelect
+      value={selectedTier ? selectedTier.upTo?.toString() : tiers[0].upTo?.toString()}
+      fullWidth
+      onChange={(event) => {
+        handleChange(event.target.value as number);
+      }}
+      id={componentId}
+      input={<TierInput />}
+      MenuProps={{
+        MenuListProps: { disablePadding: true },
+        PaperProps: {
+          sx: { marginTop: '4px', borderRadius: '10px' },
+        },
+      }}>
+      {map(tiers, (tier: PriceTierFragment) => (
+        <MenuItem className="stigg-price-tier-menu-item-text" key={tier.upTo} value={tier.upTo?.toString()}>
+          <Typography variant="body1" color="primary" style={{ lineHeight: 'unset' }}>
+            {tier.upTo} {tierUnits}
+          </Typography>
+        </MenuItem>
+      ))}
+    </TierSelect>
+  );
+}

package/src/components/common/VolumePerUnitInput.tsx

@@ -0,0 +1,40 @@
+import InputAdornment from '@mui/material/InputAdornment';
+import React from 'react';
+import { Typography } from './Typography';
+import { InputField } from '../checkout/components';
+import { TiersSelectContainerProps } from './TiersSelectContainer';
+
+export function VolumePerUnitInput({
+  width,
+  tierUnits,
+  perUnitQuantity,
+  handlePerUnitQuantityChange,
+  handleChange,
+}: Pick<TiersSelectContainerProps, 'width' | 'tierUnits' | 'perUnitQuantity' | 'handlePerUnitQuantityChange'> & {
+  handleChange: (quantity: number) => void;
+}) {
+  return (
+    <InputField
+      type="number"
+      fullWidth
+      sx={{ minHeight: '46px', width }}
+      InputProps={{
+        endAdornment: (
+          <InputAdornment position="end">
+            <Typography variant="body1" color="primary">
+              {tierUnits}
+            </Typography>
+          </InputAdornment>
+        ),
+      }}
+      value={perUnitQuantity || 1}
+      onChange={(event) => {
+        const quantity = event?.target?.value ? Number(event?.target?.value) : null;
+        if (quantity) {
+          handleChange(quantity);
+          handlePerUnitQuantityChange(quantity);
+        }
+      }}
+    />
+  );
+}

package/src/components/paywall/PlanOffering.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   BillableFeature,
   BillingPeriod,
@@ -18,7 +18,7 @@ import { flexLayoutMapper } from '../../theme/getResolvedTheme';
 import { Typography } from '../common/Typography';
 import MiniSchedule from '../../assets/mini-schedule.svg';
 import { PlanPrice } from './PlanPrice';
-import { getSelectedTier } from '../utils/priceTierUtils';
+import { getSelectedTier, getSelectedTierQuantityBeFeature } from '../utils/priceTierUtils';
 
 const PlanOfferingButtonHeight = '66px';
 
@@ -167,22 +167,28 @@ export function PlanOffering({
     );
   }
 
-  const [selectedTierByFeature, setSelectedTierByFeature] = React.useState<Record<string, PriceTierFragment>>(
+  const [perUnitQuantityByFeature, setPerUnitQuantityByFeature] = useState<Record<string, number>>({});
+  const [selectedTierByFeature, setSelectedTierByFeature] = useState<Record<string, PriceTierFragment>>(
     getSelectedTier(plan, billingPeriod, currentSubscription, {}, selectDefaultTierIndex),
   );
 
   useEffect(() => {
     setSelectedTierByFeature(getSelectedTier(plan, billingPeriod, currentSubscription, selectedTierByFeature));
+    setPerUnitQuantityByFeature(getSelectedTierQuantityBeFeature(plan, billingPeriod, currentSubscription));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [billingPeriod, currentSubscription, plan]);
 
   const onPlanButtonClick = (intentionType: SubscribeIntentionType) => {
-    const billableFeatures: BillableFeature[] = Object.keys(selectedTierByFeature).map((featureId) => ({
+    const tierBillableFeatures: BillableFeature[] = Object.keys(selectedTierByFeature).map((featureId) => ({
       featureId,
-      quantity: selectedTierByFeature[featureId].upTo,
+      quantity: selectedTierByFeature[featureId].upTo || 0,
+    }));
+    const perUnitBillableFeatures: BillableFeature[] = Object.keys(perUnitQuantityByFeature).map((featureId) => ({
+      featureId,
+      quantity: perUnitQuantityByFeature[featureId],
     }));
 
-    return onPlanSelected(intentionType, billableFeatures);
+    return onPlanSelected(intentionType, { ...tierBillableFeatures, ...perUnitBillableFeatures });
   };
 
   return (
@@ -218,6 +224,8 @@ export function PlanOffering({
           locale={locale}
           hasAnnuallyPrice={hasAnnuallyPrice}
           hasMonthlyPrice={hasMonthlyPrice}
+          setPerUnitQuantityByFeature={setPerUnitQuantityByFeature}
+          perUnitQuantityByFeature={perUnitQuantityByFeature}
         />
 
         {showCTAButton ? (
@@ -232,6 +240,7 @@ export function PlanOffering({
             paywallLocale={paywallLocale}
             withTrialLeftRow={withTrialLeftRow}
             selectedTierByFeature={selectedTierByFeature}
+            perUnitQuantityByFeature={perUnitQuantityByFeature}
           />
         ) : (
           <div style={{ height: PlanOfferingButtonHeight }} />

package/src/components/paywall/PlanOfferingButton.tsx

@@ -83,6 +83,7 @@ type PlanOfferingButtonProps = {
   onPlanSelected: (intentionType: SubscribeIntentionType) => void | Promise<void>;
   withTrialLeftRow: boolean;
   selectedTierByFeature: Record<string, PriceTierFragment>;
+  perUnitQuantityByFeature: Record<string, number>;
 };
 
 export function PlanOfferingButton({
@@ -96,6 +97,7 @@ export function PlanOfferingButton({
   withTrialLeftRow,
   currentSubscription,
   selectedTierByFeature,
+  perUnitQuantityByFeature,
 }: PlanOfferingButtonProps) {
   const theme = useTheme();
   const [isLoading, setIsLoading] = useState(false);
@@ -142,7 +144,11 @@ export function PlanOfferingButton({
       isSameBillingPeriod ||
       (plan.pricingType && [PricingType.Free, PricingType.Custom].includes(plan.pricingType))
     ) {
-      const planComparison = compareSelectedTierToCurrentTier(selectedTierByFeature, currentSubscription);
+      const planComparison = compareSelectedTierToCurrentTier(
+        selectedTierByFeature,
+        perUnitQuantityByFeature,
+        currentSubscription,
+      );
       switch (planComparison) {
         case PriceTierComparison.Lower:
           buttonProps.intentionType = SubscribeIntentionType.CHANGE_UNIT_QUANTITY;

package/src/components/paywall/PlanPrice.tsx

@@ -65,6 +65,8 @@ export const PlanPrice = ({
   locale,
   hasMonthlyPrice,
   hasAnnuallyPrice,
+  perUnitQuantityByFeature,
+  setPerUnitQuantityByFeature,
 }: {
   showStartingAt: boolean;
   withUnitPriceRow: boolean;
@@ -72,6 +74,8 @@ export const PlanPrice = ({
   withTiersRow: boolean;
   selectedTierByFeature: Record<string, PriceTierFragment>;
   setSelectedTierByFeature: React.Dispatch<React.SetStateAction<Record<string, PriceTierFragment>>>;
+  perUnitQuantityByFeature: Record<string, number>;
+  setPerUnitQuantityByFeature: React.Dispatch<React.SetStateAction<Record<string, number>>>;
   plan: PaywallPlan;
   billingPeriod: BillingPeriod;
   paywallLocale: PaywallLocalization;
@@ -86,6 +90,7 @@ export const PlanPrice = ({
     locale,
     hasMonthlyPrice,
     selectedTierByFeature,
+    perUnitQuantityByFeature,
   );
 
   // We currently only support prices with one tier - so we select the first one
@@ -94,6 +99,7 @@ export const PlanPrice = ({
   });
   const featureId = tieredPrice ? tieredPrice.feature!.featureId : undefined;
   const selectedTier = featureId ? selectedTierByFeature[featureId] : undefined;
+  const perUnitQuantity = featureId ? perUnitQuantityByFeature[featureId] : undefined;
 
   const handleTierChange = (tier: PriceTierFragment) => {
     if (!featureId) {
@@ -106,6 +112,17 @@ export const PlanPrice = ({
     }));
   };
 
+  const handlePerUnitQuantityChange = (quantity: number) => {
+    if (!featureId) {
+      return;
+    }
+
+    setPerUnitQuantityByFeature((prevState) => ({
+      ...prevState,
+      [featureId]: quantity,
+    }));
+  };
+
   return (
     <PlanPriceContainer as="div" className="stigg-price-text">
       <>
@@ -146,6 +163,9 @@ export const PlanPrice = ({
             tierUnits={tierUnits}
             selectedTier={selectedTier}
             handleTierChange={handleTierChange}
+            tiersMode={tieredPrice?.tiersMode}
+            handlePerUnitQuantityChange={handlePerUnitQuantityChange}
+            perUnitQuantity={perUnitQuantity}
           />
         ) : null}
       </>

package/src/components/utils/getPaidPriceText.ts

@@ -18,6 +18,7 @@ type GetPaidPriceTextParams = {
   shouldShowMonthlyPriceAmount: boolean;
   selectedTierByFeature: Record<string, PriceTierFragment>;
   paywallLocale: PaywallLocalization;
+  perUnitQuantityByFeature?: Record<string, number>;
 };
 
 export function getPaidPriceText({
@@ -28,6 +29,7 @@ export function getPaidPriceText({
   shouldShowMonthlyPriceAmount,
   selectedTierByFeature,
   paywallLocale,
+  perUnitQuantityByFeature,
 }: GetPaidPriceTextParams): PlanPriceText {
   const { amount, currency } = paywallCalculatedPrice || planPrices[0];
   const priceAmount = amount || 0;
@@ -53,7 +55,13 @@ export function getPaidPriceText({
         tierUnits = getPriceFeatureUnit(price);
       }
 
-      priceNumber += calculateTierPrice(price, currentTier, selectedBillingPeriod, shouldShowMonthlyPriceAmount);
+      priceNumber += calculateTierPrice(
+        price,
+        currentTier,
+        selectedBillingPeriod,
+        shouldShowMonthlyPriceAmount,
+        perUnitQuantityByFeature?.[price.feature!.featureId],
+      );
     }
   }
 

package/src/components/utils/getPlanPrice.ts

@@ -16,6 +16,7 @@ export function getPlanPrice(
   locale: string,
   shouldShowMonthlyPriceAmount: boolean,
   selectedTierByFeature?: Record<string, PriceTierFragment>,
+  perUnitQuantityByFeature?: Record<string, number>,
 ): PlanPriceText {
   switch (plan.pricingType) {
     case PricingType.Free:
@@ -48,6 +49,7 @@ export function getPlanPrice(
         paywallCalculatedPrice,
         selectedBillingPeriod: billingPeriod,
         selectedTierByFeature: selectedTierByFeature || {},
+        perUnitQuantityByFeature: perUnitQuantityByFeature || {},
       };
 
       return paywallLocale.price.paid

package/src/components/utils/priceTierUtils.ts

@@ -14,10 +14,12 @@ export function getTierByQuantity(tiers: PriceTierFragment[], quantity: number)
   if (!tiers) return undefined;
 
   const ascendingTiers = [...tiers];
-  ascendingTiers.sort((a, b) => a.upTo - b.upTo);
+  // Sort tiers by upTo value, ascending, if upTo is not set,
+  // put it at the end as it represent the last infinity tier
+  ascendingTiers.sort((a, b) => (!a.upTo ? 1 : !b.upTo ? -1 : a.upTo - b.upTo));
 
   for (const tier of ascendingTiers) {
-    if (quantity <= tier.upTo) {
+    if (tier.upTo && quantity <= tier.upTo) {
       return tier;
     }
   }
@@ -30,21 +32,52 @@ export function calculateTierPrice(
   currentTier: PriceTierFragment,
   selectedBillingPeriod: BillingPeriod,
   shouldShowMonthlyPriceAmount: boolean,
+  perUnitQuantity?: number,
 ): number {
+  const unitPrice =
+    selectedBillingPeriod === BillingPeriod.Annually && shouldShowMonthlyPriceAmount
+      ? currentTier.unitPrice.amount / 12
+      : currentTier.unitPrice.amount;
   switch (price.tiersMode) {
     case TiersMode.Volume: {
-      const unitPrice =
-        selectedBillingPeriod === BillingPeriod.Annually && shouldShowMonthlyPriceAmount
-          ? currentTier.unitPrice.amount / 12
-          : currentTier.unitPrice.amount;
-
-      return unitPrice * currentTier.upTo;
+      return unitPrice * (currentTier.upTo || 1);
+    }
+    case TiersMode.VolumePerUnit: {
+      return unitPrice * (perUnitQuantity || 1);
     }
     default:
       return 0;
   }
 }
 
+export function getSelectedTierQuantityBeFeature(
+  plan: PaywallPlan,
+  billingPeriod: BillingPeriod,
+  currentSubscription: Subscription | null,
+) {
+  const result: Record<string, number> = {};
+  const planTierPrices = plan.pricePoints.filter(
+    (price) => price.billingPeriod === billingPeriod && price.isTieredPrice,
+  );
+  if (planTierPrices.length === 1) {
+    const [price] = planTierPrices;
+    const featureId = price?.feature!.featureId;
+    if (currentSubscription && currentSubscription.plan.id === plan.id) {
+      const tieredPrice = currentSubscription?.prices.find(
+        (subscriptionPrice) =>
+          subscriptionPrice.pricingModel === BillingModel.PerUnit &&
+          subscriptionPrice.tiersMode &&
+          subscriptionPrice.feature?.featureId === featureId,
+      );
+      if (tieredPrice) {
+        result[featureId] = tieredPrice.feature?.unitQuantity || 1;
+      }
+    }
+  }
+
+  return result;
+}
+
 export function getSelectedTier(
   plan: PaywallPlan,
   billingPeriod: BillingPeriod,
@@ -64,7 +97,7 @@ export function getSelectedTier(
 
     if (selectedTierByFeature[featureId]) {
       currentTier = price.tiers?.find((tier) => tier.upTo === selectedTierByFeature[featureId].upTo) || currentTier;
-    } else if (currentSubscription) {
+    } else if (currentSubscription && currentSubscription.plan.id === plan.id) {
       const tieredPrice = currentSubscription.prices.find(
         (subscriptionPrice) =>
           subscriptionPrice.pricingModel === BillingModel.PerUnit &&
@@ -94,6 +127,7 @@ export enum PriceTierComparison {
 
 export function compareSelectedTierToCurrentTier(
   selectedTierByFeature: Record<string, PriceTierFragment>,
+  perUnitQuantityByFeature: Record<string, number>,
   currentSubscription: Subscription | null,
 ): PriceTierComparison {
   if (!currentSubscription || !selectedTierByFeature) {
@@ -108,22 +142,34 @@ export function compareSelectedTierToCurrentTier(
   }
 
   const { featureId, unitQuantity } = currentTierPrice.feature!;
+  const { tiersMode } = currentTierPrice;
 
   if (!unitQuantity) {
     return PriceTierComparison.Equal;
   }
 
   const selectedTier = selectedTierByFeature[featureId];
+  const selectedQuantity = perUnitQuantityByFeature[featureId];
   if (!selectedTier) {
     return PriceTierComparison.Equal;
   }
 
-  if (selectedTier.upTo < unitQuantity) {
-    return PriceTierComparison.Lower;
-  }
+  if (tiersMode === TiersMode.Volume) {
+    if (selectedTier.upTo && selectedTier.upTo < unitQuantity) {
+      return PriceTierComparison.Lower;
+    }
 
-  if (selectedTier.upTo > unitQuantity) {
-    return PriceTierComparison.Higher;
+    if (selectedTier.upTo && selectedTier.upTo > unitQuantity) {
+      return PriceTierComparison.Higher;
+    }
+  } else if (tiersMode === TiersMode.VolumePerUnit) {
+    if (selectedQuantity && selectedQuantity < unitQuantity) {
+      return PriceTierComparison.Lower;
+    }
+
+    if (selectedQuantity && selectedQuantity > unitQuantity) {
+      return PriceTierComparison.Higher;
+    }
   }
 
   return PriceTierComparison.Equal;

package/src/stories/mocks/checkout/mockCheckoutPreview.ts

@@ -69,7 +69,7 @@ const billableFeatureCost = (plan: Plan, billingPeriod: BillingPeriod, featureId
   const { tiers } = price;
 
   if (tiers) {
-    const quantityTier = tiers.find((tier) => tier.upTo >= quantity);
+    const quantityTier = tiers.find((tier) => tier.upTo && tier.upTo >= quantity);
     const priceTier = quantityTier || tiers[tiers.length - 1];
     return quantity * priceTier.unitPrice.amount;
   }