@schematichq/schematic-components 0.6.4 → 0.7.1

package/dist/schematic-components.esm.js

@@ -10671,7 +10671,8 @@ function BillingPriceResponseDataFromJSONTyped(json, ignoreDiscriminator) {
     externalPriceId: json["external_price_id"],
     id: json["id"],
     interval: json["interval"],
-    price: json["price"]
+    price: json["price"],
+    priceDecimal: json["price_decimal"] == null ? void 0 : json["price_decimal"]
   };
 }
 
@@ -10691,6 +10692,7 @@ function BillingPriceViewFromJSONTyped(json, ignoreDiscriminator) {
     isActive: json["is_active"],
     meterId: json["meter_id"] == null ? void 0 : json["meter_id"],
     price: json["price"],
+    priceDecimal: json["price_decimal"] == null ? void 0 : json["price_decimal"],
     priceExternalId: json["price_external_id"],
     priceId: json["price_id"],
     productExternalId: json["product_external_id"],
@@ -10717,6 +10719,7 @@ function BillingProductDetailResponseDataFromJSONTyped(json, ignoreDiscriminator
     externalId: json["external_id"],
     name: json["name"],
     price: json["price"],
+    priceDecimal: json["price_decimal"] == null ? void 0 : json["price_decimal"],
     prices: json["prices"].map(
       BillingPriceResponseDataFromJSON
     ),
@@ -10745,6 +10748,7 @@ function BillingProductForSubscriptionResponseDataFromJSONTyped(json, ignoreDisc
     meterId: json["meter_id"] == null ? void 0 : json["meter_id"],
     name: json["name"],
     price: json["price"],
+    priceDecimal: json["price_decimal"] == null ? void 0 : json["price_decimal"],
     priceExternalId: json["price_external_id"],
     priceId: json["price_id"],
     quantity: json["quantity"],
@@ -13057,7 +13061,7 @@ var EmbedProvider = ({
   useEffect2(() => {
     if (accessToken) {
       const { headers = {} } = apiConfig ?? {};
-      headers["X-Schematic-Components-Version"] = "0.6.4";
+      headers["X-Schematic-Components-Version"] = "0.7.1";
       headers["X-Schematic-Session-ID"] = sessionIdRef.current;
       const config = new Configuration({
         ...apiConfig,
@@ -13133,6 +13137,13 @@ var getFeatureName = (feature, count = 0) => {
   }
   return (0, import_pluralize.default)(name, count);
 };
+function getBillingPrice(billingPrice) {
+  if (!billingPrice) {
+    return;
+  }
+  const price = typeof billingPrice.priceDecimal === "string" ? parseFloat(billingPrice.priceDecimal) : billingPrice.price;
+  return { ...billingPrice, price };
+}
 
 // src/utils/color.ts
 function hexToHSL(color) {
@@ -13272,7 +13283,7 @@ function formatCurrency(amount, currency) {
       return `$${formatted}${symbol}`;
     };
     if (dollars >= 1e6) {
-      formatValue(dollars / 1e6, "M");
+      return formatValue(dollars / 1e6, "M");
     }
     if (dollars >= 1e3) {
       return formatValue(dollars / 1e3, "k");
@@ -13395,10 +13406,7 @@ import { forwardRef as forwardRef3 } from "react";
 // src/components/ui/box/styles.ts
 var Box = dt.div((props) => {
   function reducer(acc, [key, value]) {
-    if (key.startsWith("$") && ![
-      "$viewport",
-      ...Object.values(TextPropNames).filter((prop) => prop !== "$color")
-    ].includes(key)) {
+    if (key.startsWith("$") && !["$viewport"].includes(key)) {
       acc.push(
         // keys will always be CSS properties
         attr(camelToHyphen(key.slice(1)), value)
@@ -13521,6 +13529,7 @@ var Button2 = forwardRef(
     children,
     ...props
   }, ref) => {
+    const theme = nt();
     return /* @__PURE__ */ jsxs2(
       Button,
       {
@@ -13531,7 +13540,7 @@ var Button2 = forwardRef(
         disabled,
         ...props,
         children: [
-          /* @__PURE__ */ jsx2(Loader, { $size: "sm", $isLoading: isLoading }),
+          /* @__PURE__ */ jsx2(Loader, { $color: theme.primary, $size: "sm", $isLoading: isLoading }),
           children
         ]
       }
@@ -14039,7 +14048,7 @@ var Loader = dt.div`
   }
   return lt`
       border-color: ${color};
-      border-top-color: ${colorFn(color, 42.5)};
+      border-top-color: ${colorFn(color, 0.425)};
     `;
 }}
 
@@ -14219,8 +14228,11 @@ var ModalHeader = ({
 };
 
 // src/components/ui/progress-bar/styles.ts
-var Container3 = dt(Flex)`
+var Container3 = dt.div`
   position: relative;
+  display: flex;
+  align-items: center;
+  gap: 1rem;
 `;
 
 // src/components/ui/progress-bar/ProgressBar.tsx
@@ -14250,59 +14262,51 @@ var ProgressBar = ({
     orange: "#DB6769",
     red: "#EF4444"
   };
-  return /* @__PURE__ */ jsxs4(
-    Container3,
-    {
-      $alignItems: "center",
-      $gap: `${16 / TEXT_BASE_SIZE}rem`,
-      ...props,
-      children: [
-        /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsxs4(Container3, { ...props, children: [
+    /* @__PURE__ */ jsx7(
+      Flex,
+      {
+        $position: "relative",
+        $alignItems: "center",
+        $width: `${barWidth}`,
+        $maxWidth: "100%",
+        children: /* @__PURE__ */ jsx7(
           Flex,
           {
             $position: "relative",
-            $alignItems: "center",
-            $width: `${barWidth}`,
-            $maxWidth: "100%",
+            $overflow: "hidden",
+            $width: "100%",
+            $height: `${8 / TEXT_BASE_SIZE}rem`,
+            $backgroundColor: bgColor,
+            $borderRadius: "9999px",
             children: /* @__PURE__ */ jsx7(
-              Flex,
+              Box,
               {
-                $position: "relative",
-                $overflow: "hidden",
-                $width: "100%",
-                $height: `${8 / TEXT_BASE_SIZE}rem`,
-                $backgroundColor: bgColor,
-                $borderRadius: "9999px",
-                children: /* @__PURE__ */ jsx7(
-                  Box,
-                  {
-                    $width: `${Math.min(progress, 100)}%`,
-                    $height: "100%",
-                    $backgroundColor: barColorMap[color],
-                    $borderRadius: "9999px"
-                  }
-                )
+                $width: `${Math.min(progress, 100)}%`,
+                $height: "100%",
+                $backgroundColor: barColorMap[color],
+                $borderRadius: "9999px"
               }
             )
           }
-        ),
-        total !== 0 && /* @__PURE__ */ jsxs4(
-          Text,
-          {
-            $font: theme.typography.text.fontFamily,
-            $size: 14,
-            $weight: 500,
-            $color: theme.typography.text.color,
-            children: [
-              value,
-              "/",
-              total
-            ]
-          }
         )
-      ]
-    }
-  );
+      }
+    ),
+    total !== 0 && /* @__PURE__ */ jsxs4(
+      Text,
+      {
+        $font: theme.typography.text.fontFamily,
+        $size: 14,
+        $weight: 500,
+        $color: theme.typography.text.color,
+        children: [
+          value,
+          "/",
+          total
+        ]
+      }
+    )
+  ] });
 };
 
 // src/components/ui/text/styles.ts
@@ -14315,8 +14319,7 @@ var TextPropNames = /* @__PURE__ */ ((TextPropNames2) => {
   TextPropNames2["Leading"] = "$leading";
   return TextPropNames2;
 })(TextPropNames || {});
-var Text = dt(Box).attrs(({ as = "span", onClick }) => ({
-  as,
+var Text = dt.span.attrs(({ onClick }) => ({
   ...onClick && { tabIndex: 0 }
 }))`
   ${({ $font }) => $font && lt`
@@ -14352,7 +14355,7 @@ import { useCallback as useCallback6, useLayoutEffect as useLayoutEffect3, useRe
 import { createPortal } from "react-dom";
 
 // src/components/ui/tooltip/styles.ts
-var Trigger = dt(Box)``;
+var Trigger = dt.div``;
 var coords = (position2) => {
   let x2 = 0;
   let y2 = 0;
@@ -14419,7 +14422,7 @@ var grow = (translate) => {
     }
   `;
 };
-var Content = dt(Box).withConfig({
+var Content = dt.div.withConfig({
   shouldForwardProp: (prop) => !["x", "y", "position", "zIndex"].includes(prop)
 })(({ x: x2, y: y2, position: position2, zIndex }) => {
   const translate = coords(position2);
@@ -14536,6 +14539,7 @@ var Tooltip = ({
 // src/components/layout/card/styles.ts
 var Element = dt(Box)``;
 var FussyChild = dt(Element)``;
+var Notice = dt(Box)``;
 var cardBoxShadow = "0px 1px 20px 0px #1018280F, 0px 1px 3px 0px #1018281A";
 var StyledCard = dt.div(({ theme }) => {
   const { l: l2 } = hexToHSL(theme.card.background);
@@ -14563,6 +14567,11 @@ var StyledCard = dt.div(({ theme }) => {
             `}
       }
     }
+
+    ${Notice}:first-child {
+      border-top-left-radius: ${borderRadius};
+      border-top-right-radius: ${borderRadius};
+    }
   `;
 });
 
@@ -14617,11 +14626,12 @@ Column.displayName = "Column";
 import { forwardRef as forwardRef5 } from "react";
 
 // src/components/layout/root/styles.ts
-var Container2 = dt(Box)`
+var Container2 = dt.div`
   all: initial;
   box-sizing: border-box;
   display: block;
   font-size: ${TEXT_BASE_SIZE}px;
+  line-height: 1.35;
   width: 100%;
   height: 100%;
 
@@ -14902,49 +14912,65 @@ var Sidebar = ({
   const isLightBackground = useIsLightBackground();
   const currentPlan = data.company?.plan;
   const currentAddOns = data.company?.addOns || [];
-  const currentUsageBasedEntitlements = data.activeUsageBasedEntitlements.reduce(
-    (acc, usageData) => {
-      const featureUsage = data.featureUsage?.features.find(
-        (usage2) => usage2.feature?.id === usageData.featureId
-      );
-      const allocation = featureUsage?.allocation || 0;
-      const usage = featureUsage?.usage || 0;
-      acc.push({
-        usageData,
-        allocation,
-        quantity: allocation ?? usage,
-        usage
-      });
-      return acc;
-    },
-    []
-  );
-  const payInAdvanceEntitlements = usageBasedEntitlements.filter(
-    ({ entitlement }) => entitlement.priceBehavior === "pay_in_advance"
-  );
-  const payAsYouGoEntitlements = usageBasedEntitlements.filter(
-    ({ entitlement }) => entitlement.priceBehavior === "pay_as_you_go"
-  );
+  const currentUsageBasedEntitlements = useMemo4(() => {
+    return (data.featureUsage?.features || []).reduce(
+      (acc, entitlement) => {
+        if (entitlement.priceBehavior && (planPeriod === "month" && entitlement.monthlyUsageBasedPrice || planPeriod === "year" && entitlement.yearlyUsageBasedPrice)) {
+          const allocation = entitlement.allocation || 0;
+          const usage = entitlement.usage || 0;
+          acc.push({
+            ...entitlement,
+            allocation,
+            usage,
+            quantity: allocation ?? usage
+          });
+        }
+        return acc;
+      },
+      []
+    );
+  }, [data.featureUsage?.features, planPeriod]);
+  const { payAsYouGoEntitlements, payInAdvanceEntitlements } = useMemo4(() => {
+    const payAsYouGoEntitlements2 = [];
+    const payInAdvanceEntitlements2 = usageBasedEntitlements.filter(
+      (entitlement) => {
+        if (entitlement.priceBehavior === "pay_as_you_go") {
+          payAsYouGoEntitlements2.push(entitlement);
+        }
+        return entitlement.priceBehavior === "pay_in_advance";
+      }
+    );
+    return { payAsYouGoEntitlements: payAsYouGoEntitlements2, payInAdvanceEntitlements: payInAdvanceEntitlements2 };
+  }, [usageBasedEntitlements]);
   const subscriptionPrice = useMemo4(() => {
-    let total = 0;
     let planPrice;
     let currency;
     if (selectedPlan) {
-      planPrice = planPeriod === "month" ? selectedPlan.monthlyPrice?.price : selectedPlan.yearlyPrice?.price;
-      currency = planPeriod === "month" ? selectedPlan.monthlyPrice?.currency : selectedPlan.yearlyPrice?.currency;
-      if (planPrice) {
-        total += planPrice;
-      }
+      const planBillingPrice = getBillingPrice(
+        planPeriod === "year" ? selectedPlan.yearlyPrice : selectedPlan.monthlyPrice
+      );
+      planPrice = planBillingPrice?.price;
+      currency = planBillingPrice?.currency;
     } else if (typeof currentPlan?.planPrice === "number") {
       planPrice = currentPlan.planPrice;
     }
-    const addOnCost = addOns.reduce(
-      (sum, addOn) => sum + (addOn.isSelected ? (planPeriod === "month" ? addOn.monthlyPrice : addOn.yearlyPrice)?.price ?? 0 : 0),
-      0
-    );
+    let total = 0;
+    if (planPrice) {
+      total += planPrice;
+    }
+    const addOnCost = addOns.reduce((sum, addOn) => {
+      if (addOn.isSelected) {
+        sum += getBillingPrice(
+          planPeriod === "year" ? addOn.yearlyPrice : addOn.monthlyPrice
+        )?.price ?? 0;
+      }
+      return sum;
+    }, 0);
     total += addOnCost;
     const payInAdvanceCost = payInAdvanceEntitlements.reduce(
-      (sum, { entitlement, quantity }) => sum + quantity * ((planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.price ?? 0),
+      (sum, entitlement) => sum + entitlement.quantity * (getBillingPrice(
+        planPeriod === "year" ? entitlement.meteredYearlyPrice : entitlement.meteredMonthlyPrice
+      )?.price ?? 0),
       0
     );
     total += payInAdvanceCost;
@@ -14968,7 +14994,7 @@ var Sidebar = ({
     window.dispatchEvent(event);
   };
   const checkout = useCallback7(async () => {
-    const priceId = (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.id;
+    const priceId = (planPeriod === "year" ? selectedPlan?.yearlyPrice : selectedPlan?.monthlyPrice)?.id;
     if (!api || !selectedPlan || !priceId) {
       return;
     }
@@ -14981,7 +15007,7 @@ var Sidebar = ({
           newPriceId: priceId,
           addOnIds: addOns.reduce((acc, addOn) => {
             if (addOn.isSelected && !selectedPlan.companyCanTrial) {
-              const addOnPriceId = (planPeriod === "month" ? addOn?.monthlyPrice : addOn?.yearlyPrice)?.id;
+              const addOnPriceId = (planPeriod === "year" ? addOn?.yearlyPrice : addOn?.monthlyPrice)?.id;
               if (addOnPriceId) {
                 acc.push({
                   addOnId: addOn.id,
@@ -14992,8 +15018,8 @@ var Sidebar = ({
             return acc;
           }, []),
           payInAdvance: payInAdvanceEntitlements.reduce(
-            (acc, { entitlement, quantity }) => {
-              const priceId2 = (planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.priceId;
+            (acc, { meteredMonthlyPrice, meteredYearlyPrice, quantity }) => {
+              const priceId2 = (planPeriod === "year" ? meteredYearlyPrice : meteredMonthlyPrice)?.priceId;
               if (priceId2) {
                 acc.push({
                   priceId: priceId2,
@@ -15061,48 +15087,62 @@ var Sidebar = ({
     ({ quantity, usage }) => quantity >= usage
   )) && !isLoading;
   const canCheckout = canUpdateSubscription && (!!data.subscription?.paymentMethod || typeof paymentMethodId === "string");
-  const changedUsageBasedEntitlements = [];
-  const addedUsageBasedEntitlements = usageBasedEntitlements.reduce(
-    (acc, selected) => {
-      const changed = currentUsageBasedEntitlements.find(
-        (current) => current.usageData.featureId === selected.entitlement.featureId && current.quantity !== selected.quantity
-      );
-      if (changed) {
-        changedUsageBasedEntitlements.push({
-          entitlement: selected.entitlement,
-          previous: changed,
-          next: {
-            allocation: selected.allocation,
-            quantity: selected.quantity,
-            usage: selected.usage
-          }
-        });
-      } else {
-        acc.push(selected);
-      }
-      return acc;
-    },
-    []
-  );
-  const removedUsageBasedEntitlements = currentUsageBasedEntitlements.reduce(
-    (acc, current) => {
-      const match2 = usageBasedEntitlements.every(
-        ({ entitlement }) => entitlement.featureId !== current.usageData.featureId
-      ) && data.featureUsage?.features.find(
-        (usage) => usage.feature?.id === current.usageData.featureId
-      );
-      if (match2) {
-        acc.push({
-          usage: match2,
-          allocation: current.allocation,
-          quantity: current.quantity
-        });
-      }
-      return acc;
-    },
-    []
-  );
-  const willUsageBasedEntitlementsChange = changedUsageBasedEntitlements.length > 0 || addedUsageBasedEntitlements.length > 0 || removedUsageBasedEntitlements.length > 0;
+  const {
+    changedUsageBasedEntitlements,
+    addedUsageBasedEntitlements,
+    removedUsageBasedEntitlements,
+    willUsageBasedEntitlementsChange
+  } = useMemo4(() => {
+    const changedUsageBasedEntitlements2 = [];
+    const addedUsageBasedEntitlements2 = selectedPlan ? usageBasedEntitlements.reduce(
+      (acc, selected) => {
+        const changed = currentUsageBasedEntitlements.find(
+          (current) => current.entitlementId === selected.id && current.quantity !== selected.quantity
+        );
+        if (changed) {
+          changedUsageBasedEntitlements2.push({
+            previous: changed,
+            next: selected
+          });
+        } else {
+          acc.push(selected);
+        }
+        return acc;
+      },
+      []
+    ) : [];
+    const removedUsageBasedEntitlements2 = selectedPlan ? currentUsageBasedEntitlements.reduce(
+      (acc, current) => {
+        const match2 = usageBasedEntitlements.every(
+          (entitlement) => entitlement.id !== current.entitlementId
+        ) && data.featureUsage?.features.find(
+          (usage) => usage.entitlementId === current.entitlementId
+        );
+        if (match2) {
+          acc.push({
+            ...match2,
+            allocation: current.allocation,
+            usage: current.usage,
+            quantity: current.quantity
+          });
+        }
+        return acc;
+      },
+      []
+    ) : [];
+    const willUsageBasedEntitlementsChange2 = changedUsageBasedEntitlements2.length > 0 || addedUsageBasedEntitlements2.length > 0 || removedUsageBasedEntitlements2.length > 0;
+    return {
+      changedUsageBasedEntitlements: changedUsageBasedEntitlements2,
+      addedUsageBasedEntitlements: addedUsageBasedEntitlements2,
+      removedUsageBasedEntitlements: removedUsageBasedEntitlements2,
+      willUsageBasedEntitlementsChange: willUsageBasedEntitlementsChange2
+    };
+  }, [
+    selectedPlan,
+    data.featureUsage?.features,
+    currentUsageBasedEntitlements,
+    usageBasedEntitlements
+  ]);
   const removedAddOns = currentAddOns.filter(
     (current) => !selectedAddOns.some((selected) => current.id === selected.id)
   );
@@ -15116,6 +15156,9 @@ var Sidebar = ({
   if (isTrialable && selectedPlan.trialDays) {
     trialEndsOn.setDate(trialEndsOn.getDate() + selectedPlan.trialDays);
   }
+  const selectedPlanBillingPrice = getBillingPrice(
+    planPeriod === "year" ? selectedPlan?.yearlyPrice : selectedPlan?.monthlyPrice
+  );
   return /* @__PURE__ */ jsxs8(
     Flex,
     {
@@ -15276,8 +15319,8 @@ var Sidebar = ({
                             $color: theme.typography.text.color,
                             children: [
                               formatCurrency(
-                                (planPeriod === "month" ? selectedPlan.monthlyPrice : selectedPlan.yearlyPrice)?.price ?? 0,
-                                (planPeriod === "month" ? selectedPlan.monthlyPrice : selectedPlan.yearlyPrice)?.currency
+                                selectedPlanBillingPrice?.price ?? 0,
+                                selectedPlanBillingPrice?.currency
                               ),
                               /* @__PURE__ */ jsxs8("sub", { children: [
                                 "/",
@@ -15303,9 +15346,14 @@ var Sidebar = ({
                   }
                 ) }),
                 removedUsageBasedEntitlements.reduce(
-                  (acc, { allocation, quantity, usage }, index) => {
-                    if (typeof allocation === "number" && usage.feature?.name) {
-                      const price = (planPeriod === "month" ? usage.monthlyUsageBasedPrice : usage.yearlyUsageBasedPrice)?.price;
+                  (acc, entitlement, index) => {
+                    if (typeof entitlement.allocation === "number" && entitlement.feature?.name) {
+                      const {
+                        price: entitlementPrice,
+                        currency: entitlementCurrency
+                      } = getBillingPrice(
+                        planPeriod === "year" ? entitlement.yearlyUsageBasedPrice : entitlement.monthlyUsageBasedPrice
+                      ) || {};
                       acc.push(
                         /* @__PURE__ */ jsxs8(
                           Flex,
@@ -15324,11 +15372,14 @@ var Sidebar = ({
                                   $size: theme.typography.heading4.fontSize,
                                   $weight: theme.typography.heading4.fontWeight,
                                   $color: theme.typography.heading4.color,
-                                  children: usage.priceBehavior === "pay_in_advance" ? /* @__PURE__ */ jsxs8(Fragment3, { children: [
-                                    quantity,
+                                  children: entitlement.priceBehavior === "pay_in_advance" ? /* @__PURE__ */ jsxs8(Fragment3, { children: [
+                                    entitlement.quantity,
                                     " ",
-                                    getFeatureName(usage.feature, quantity)
-                                  ] }) : usage.feature.name
+                                    getFeatureName(
+                                      entitlement.feature,
+                                      entitlement.quantity
+                                    )
+                                  ] }) : entitlement.feature.name
                                 }
                               ) }),
                               /* @__PURE__ */ jsx13(Box, { $whiteSpace: "nowrap", children: /* @__PURE__ */ jsxs8(
@@ -15339,24 +15390,24 @@ var Sidebar = ({
                                   $weight: theme.typography.text.fontWeight,
                                   $color: theme.typography.text.color,
                                   children: [
-                                    usage.priceBehavior === "pay_in_advance" && typeof price === "number" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
+                                    entitlement.priceBehavior === "pay_in_advance" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
                                       formatCurrency(
-                                        price * quantity,
-                                        (planPeriod === "month" ? usage.monthlyUsageBasedPrice : usage.yearlyUsageBasedPrice)?.currency
+                                        (entitlementPrice ?? 0) * entitlement.quantity,
+                                        entitlementCurrency
                                       ),
                                       /* @__PURE__ */ jsxs8("sub", { children: [
                                         "/",
                                         shortenPeriod(planPeriod)
                                       ] })
                                     ] }),
-                                    usage.priceBehavior === "pay_as_you_go" && typeof price === "number" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
+                                    entitlement.priceBehavior === "pay_as_you_go" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
                                       formatCurrency(
-                                        price,
-                                        (planPeriod === "month" ? usage.monthlyUsageBasedPrice : usage.yearlyUsageBasedPrice)?.currency
+                                        entitlementPrice ?? 0,
+                                        entitlementCurrency
                                       ),
                                       /* @__PURE__ */ jsxs8("sub", { children: [
                                         "/",
-                                        getFeatureName(usage.feature, 1)
+                                        getFeatureName(entitlement.feature, 1)
                                       ] })
                                     ] })
                                   ]
@@ -15373,8 +15424,14 @@ var Sidebar = ({
                   []
                 ),
                 changedUsageBasedEntitlements.reduce(
-                  (acc, { entitlement, previous, next: next2 }, index) => {
-                    if (entitlement?.feature?.name) {
+                  (acc, { previous, next: next2 }, index) => {
+                    if (next2.feature?.name) {
+                      const {
+                        price: entitlementPrice,
+                        currency: entitlementCurrency
+                      } = getBillingPrice(
+                        planPeriod === "year" ? next2.meteredYearlyPrice : next2.meteredMonthlyPrice
+                      ) || {};
                       acc.push(
                         /* @__PURE__ */ jsxs8(Box, { children: [
                           /* @__PURE__ */ jsxs8(
@@ -15397,7 +15454,7 @@ var Sidebar = ({
                                     children: [
                                       previous.quantity,
                                       " ",
-                                      getFeatureName(entitlement.feature)
+                                      getFeatureName(next2.feature)
                                     ]
                                   }
                                 ) }),
@@ -15410,8 +15467,8 @@ var Sidebar = ({
                                     $color: theme.typography.text.color,
                                     children: [
                                       formatCurrency(
-                                        ((planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.price || 0) * previous.quantity,
-                                        (planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.currency
+                                        (entitlementPrice ?? 0) * previous.quantity,
+                                        entitlementCurrency
                                       ),
                                       /* @__PURE__ */ jsxs8("sub", { children: [
                                         "/",
@@ -15440,7 +15497,7 @@ var Sidebar = ({
                                     children: [
                                       next2.quantity,
                                       " ",
-                                      getFeatureName(entitlement.feature)
+                                      getFeatureName(next2.feature)
                                     ]
                                   }
                                 ) }),
@@ -15453,8 +15510,8 @@ var Sidebar = ({
                                     $color: theme.typography.text.color,
                                     children: [
                                       formatCurrency(
-                                        ((planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.price || 0) * next2.quantity,
-                                        (planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.currency
+                                        (entitlementPrice ?? 0) * next2.quantity,
+                                        entitlementCurrency
                                       ),
                                       /* @__PURE__ */ jsxs8("sub", { children: [
                                         "/",
@@ -15474,9 +15531,14 @@ var Sidebar = ({
                   []
                 ),
                 addedUsageBasedEntitlements.reduce(
-                  (acc, { entitlement, quantity }, index) => {
+                  (acc, entitlement, index) => {
                     if (entitlement.feature?.name) {
-                      const price = (planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.price;
+                      const {
+                        price: entitlementPrice,
+                        currency: entitlementCurrency
+                      } = getBillingPrice(
+                        planPeriod === "year" ? entitlement.meteredYearlyPrice : entitlement.meteredMonthlyPrice
+                      ) || {};
                       acc.push(
                         /* @__PURE__ */ jsxs8(
                           Flex,
@@ -15493,9 +15555,12 @@ var Sidebar = ({
                                   $weight: theme.typography.heading4.fontWeight,
                                   $color: theme.typography.heading4.color,
                                   children: entitlement.priceBehavior === "pay_in_advance" ? /* @__PURE__ */ jsxs8(Fragment3, { children: [
-                                    quantity,
+                                    entitlement.quantity,
                                     " ",
-                                    getFeatureName(entitlement.feature, quantity)
+                                    getFeatureName(
+                                      entitlement.feature,
+                                      entitlement.quantity
+                                    )
                                   ] }) : entitlement.feature.name
                                 }
                               ) }),
@@ -15507,20 +15572,20 @@ var Sidebar = ({
                                   $weight: theme.typography.text.fontWeight,
                                   $color: theme.typography.text.color,
                                   children: [
-                                    entitlement.priceBehavior === "pay_in_advance" && typeof price === "number" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
+                                    entitlement.priceBehavior === "pay_in_advance" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
                                       formatCurrency(
-                                        price * quantity,
-                                        (planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.currency
+                                        (entitlementPrice ?? 0) * entitlement.quantity,
+                                        entitlementCurrency
                                       ),
                                       /* @__PURE__ */ jsxs8("sub", { children: [
                                         "/",
                                         shortenPeriod(planPeriod)
                                       ] })
                                     ] }),
-                                    entitlement.priceBehavior === "pay_as_you_go" && typeof price === "number" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
+                                    entitlement.priceBehavior === "pay_as_you_go" && /* @__PURE__ */ jsxs8(Fragment3, { children: [
                                       formatCurrency(
-                                        price,
-                                        (planPeriod === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.currency
+                                        entitlementPrice ?? 0,
+                                        entitlementCurrency
                                       ),
                                       /* @__PURE__ */ jsxs8("sub", { children: [
                                         "/",
@@ -15579,8 +15644,8 @@ var Sidebar = ({
                           children: [
                             "-",
                             formatCurrency(
-                              (planPeriod === "month" ? selectedPlan.monthlyPrice : selectedPlan.yearlyPrice)?.price ?? 0,
-                              (planPeriod === "month" ? selectedPlan.monthlyPrice : selectedPlan.yearlyPrice)?.currency
+                              selectedPlanBillingPrice?.price ?? 0,
+                              selectedPlanBillingPrice?.currency
                             ),
                             "/",
                             /* @__PURE__ */ jsx13("sub", { children: shortenPeriod(planPeriod) })
@@ -15602,89 +15667,93 @@ var Sidebar = ({
                     children: t2("Add-ons")
                   }
                 ) }),
-                removedAddOns.map((addOn, index) => /* @__PURE__ */ jsxs8(
-                  Flex,
-                  {
-                    $justifyContent: "space-between",
-                    $alignItems: "center",
-                    $gap: "1rem",
-                    $opacity: "0.625",
-                    $textDecoration: "line-through",
-                    $color: theme.typography.heading4.color,
-                    children: [
-                      /* @__PURE__ */ jsx13(Box, { children: /* @__PURE__ */ jsx13(
-                        Text,
-                        {
-                          $font: theme.typography.heading4.fontFamily,
-                          $size: theme.typography.heading4.fontSize,
-                          $weight: theme.typography.heading4.fontWeight,
-                          $color: theme.typography.heading4.color,
-                          children: addOn.name
-                        }
-                      ) }),
-                      typeof addOn.planPrice === "number" && addOn.planPeriod && /* @__PURE__ */ jsx13(Box, { $whiteSpace: "nowrap", children: /* @__PURE__ */ jsxs8(
-                        Text,
-                        {
-                          $font: theme.typography.text.fontFamily,
-                          $size: theme.typography.text.fontSize,
-                          $weight: theme.typography.text.fontWeight,
-                          $color: theme.typography.text.color,
-                          children: [
-                            formatCurrency(
-                              addOn.planPrice,
-                              (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
-                            ),
-                            /* @__PURE__ */ jsxs8("sub", { children: [
-                              "/",
-                              shortenPeriod(addOn.planPeriod)
-                            ] })
-                          ]
-                        }
-                      ) })
-                    ]
-                  },
-                  index
-                )),
-                selectedAddOns.map((addOn, index) => /* @__PURE__ */ jsxs8(
-                  Flex,
-                  {
-                    $justifyContent: "space-between",
-                    $alignItems: "center",
-                    $gap: "1rem",
-                    children: [
-                      /* @__PURE__ */ jsx13(Box, { children: /* @__PURE__ */ jsx13(
-                        Text,
-                        {
-                          $font: theme.typography.heading4.fontFamily,
-                          $size: theme.typography.heading4.fontSize,
-                          $weight: theme.typography.heading4.fontWeight,
-                          $color: theme.typography.heading4.color,
-                          children: addOn.name
-                        }
-                      ) }),
-                      /* @__PURE__ */ jsx13(Box, { $whiteSpace: "nowrap", children: /* @__PURE__ */ jsxs8(
-                        Text,
-                        {
-                          $font: theme.typography.text.fontFamily,
-                          $size: theme.typography.text.fontSize,
-                          $weight: theme.typography.text.fontWeight,
-                          $color: theme.typography.text.color,
-                          children: [
-                            formatCurrency(
-                              (planPeriod === "month" ? addOn.monthlyPrice : addOn.yearlyPrice)?.price ?? 0,
-                              (planPeriod === "month" ? addOn.monthlyPrice : addOn.yearlyPrice)?.currency
-                            ),
-                            /* @__PURE__ */ jsxs8("sub", { children: [
-                              "/",
-                              shortenPeriod(planPeriod)
-                            ] })
-                          ]
-                        }
-                      ) })
-                    ]
-                  },
-                  index
-                ))
+                removedAddOns.map((addOn, index) => {
+                  return /* @__PURE__ */ jsxs8(
+                    Flex,
+                    {
+                      $justifyContent: "space-between",
+                      $alignItems: "center",
+                      $gap: "1rem",
+                      $opacity: "0.625",
+                      $textDecoration: "line-through",
+                      $color: theme.typography.heading4.color,
+                      children: [
+                        /* @__PURE__ */ jsx13(Box, { children: /* @__PURE__ */ jsx13(
+                          Text,
+                          {
+                            $font: theme.typography.heading4.fontFamily,
+                            $size: theme.typography.heading4.fontSize,
+                            $weight: theme.typography.heading4.fontWeight,
+                            $color: theme.typography.heading4.color,
+                            children: addOn.name
+                          }
+                        ) }),
+                        typeof addOn.planPrice === "number" && addOn.planPeriod && /* @__PURE__ */ jsx13(Box, { $whiteSpace: "nowrap", children: /* @__PURE__ */ jsxs8(
+                          Text,
+                          {
+                            $font: theme.typography.text.fontFamily,
+                            $size: theme.typography.text.fontSize,
+                            $weight: theme.typography.text.fontWeight,
+                            $color: theme.typography.text.color,
+                            children: [
+                              formatCurrency(
+                                addOn.planPrice,
+                                selectedPlanBillingPrice?.currency
+                              ),
+                              /* @__PURE__ */ jsxs8("sub", { children: [
+                                "/",
+                                shortenPeriod(addOn.planPeriod)
+                              ] })
+                            ]
+                          }
+                        ) })
+                      ]
+                    },
+                    index
+                  );
+                }),
+                selectedAddOns.map((addOn, index) => {
+                  const { price: addOnPrice, currency: addOnCurrency } = getBillingPrice(
+                    planPeriod === "year" ? addOn.yearlyPrice : addOn.monthlyPrice
+                  ) || {};
+                  return /* @__PURE__ */ jsxs8(
+                    Flex,
+                    {
+                      $justifyContent: "space-between",
+                      $alignItems: "center",
+                      $gap: "1rem",
+                      children: [
+                        /* @__PURE__ */ jsx13(Box, { children: /* @__PURE__ */ jsx13(
+                          Text,
+                          {
+                            $font: theme.typography.heading4.fontFamily,
+                            $size: theme.typography.heading4.fontSize,
+                            $weight: theme.typography.heading4.fontWeight,
+                            $color: theme.typography.heading4.color,
+                            children: addOn.name
+                          }
+                        ) }),
+                        /* @__PURE__ */ jsx13(Box, { $whiteSpace: "nowrap", children: /* @__PURE__ */ jsxs8(
+                          Text,
+                          {
+                            $font: theme.typography.text.fontFamily,
+                            $size: theme.typography.text.fontSize,
+                            $weight: theme.typography.text.fontWeight,
+                            $color: theme.typography.text.color,
+                            children: [
+                              formatCurrency(addOnPrice ?? 0, addOnCurrency),
+                              /* @__PURE__ */ jsxs8("sub", { children: [
+                                "/",
+                                shortenPeriod(planPeriod)
+                              ] })
+                            ]
+                          }
+                        ) })
+                      ]
+                    },
+                    index
+                  );
+                })
               ] }),
               proration !== 0 && /* @__PURE__ */ jsxs8(Fragment3, { children: [
                 /* @__PURE__ */ jsx13(Box, { $opacity: "0.625", children: /* @__PURE__ */ jsx13(
@@ -15723,7 +15792,7 @@ var Sidebar = ({
                           $color: theme.typography.text.color,
                           children: formatCurrency(
                             proration,
-                            (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
+                            selectedPlanBillingPrice?.currency
                           )
                         }
                       ) })
@@ -15830,7 +15899,7 @@ var Sidebar = ({
                         $color: theme.typography.text.color,
                         children: formatCurrency(
                           newCharges / 100 * percentOff,
-                          (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
+                          selectedPlanBillingPrice?.currency
                         )
                       }
                     ) })
@@ -15854,7 +15923,7 @@ var Sidebar = ({
                         children: t2("X off", {
                           amount: formatCurrency(
                             Math.abs(amountOff),
-                            (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
+                            selectedPlanBillingPrice?.currency
                           )
                         })
                       }
@@ -15870,7 +15939,7 @@ var Sidebar = ({
                           "-",
                           formatCurrency(
                             Math.abs(amountOff),
-                            (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
+                            selectedPlanBillingPrice?.currency
                           )
                         ]
                       }
@@ -15893,7 +15962,7 @@ var Sidebar = ({
                         $weight: theme.typography.text.fontWeight,
                         $color: theme.typography.text.color,
                         children: [
-                          planPeriod === "month" ? "Monthly" : "Yearly",
+                          planPeriod === "year" ? "Yearly" : "Monthly",
                           " total:"
                         ]
                       }
@@ -15946,7 +16015,7 @@ var Sidebar = ({
                         $color: theme.typography.text.color,
                         children: formatCurrency(
                           Math.max(0, dueNow),
-                          (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
+                          selectedPlanBillingPrice?.currency
                         )
                       }
                     ) })
@@ -15976,7 +16045,7 @@ var Sidebar = ({
                     $color: theme.typography.text.color,
                     children: formatCurrency(
                       Math.abs(dueNow),
-                      (planPeriod === "month" ? selectedPlan?.monthlyPrice : selectedPlan?.yearlyPrice)?.currency
+                      selectedPlanBillingPrice?.currency
                     )
                   }
                 ) })
@@ -16043,6 +16112,9 @@ var AddOns = ({ addOns, toggle, isLoading, period }) => {
       $gridTemplateColumns: "repeat(auto-fill, minmax(300px, 1fr))",
       $gap: "1rem",
       children: addOns.map((addOn, index) => {
+        const { price, currency } = getBillingPrice(
+          period === "year" ? addOn.yearlyPrice : addOn.monthlyPrice
+        ) || {};
         return /* @__PURE__ */ jsxs9(
           Flex,
           {
@@ -16086,10 +16158,7 @@ var AddOns = ({ addOns, toggle, isLoading, period }) => {
                       $size: theme.typography.heading2.fontSize,
                       $weight: theme.typography.heading2.fontWeight,
                       $color: theme.typography.heading2.color,
-                      children: formatCurrency(
-                        (period === "month" ? addOn.monthlyPrice : addOn.yearlyPrice)?.price ?? 0,
-                        (period === "month" ? addOn.monthlyPrice : addOn.yearlyPrice)?.currency
-                      )
+                      children: formatCurrency(price ?? 0, currency)
                     }
                   ),
                   /* @__PURE__ */ jsxs9(
@@ -16360,7 +16429,7 @@ var Checkout = ({
         $alignItems: "center",
         $flexGrow: 1,
         $marginTop: "-3.5rem",
-        children: /* @__PURE__ */ jsx15(Loader, { $size: "3xl" })
+        children: /* @__PURE__ */ jsx15(Loader, { $color: theme.primary, $size: "3xl" })
       }
     );
   }
@@ -16588,7 +16657,9 @@ var Plan = ({
       children: plans.map((plan, planIndex) => {
         const count = entitlementCounts[plan.id];
         const isExpanded = count.limit > VISIBLE_ENTITLEMENT_COUNT;
-        const { price: planPrice, currency: planCurrency } = (period === "month" ? plan.monthlyPrice : period === "year" && plan.yearlyPrice) || {};
+        const { price: planPrice, currency: planCurrency } = getBillingPrice(
+          period === "year" ? plan.yearlyPrice : plan.monthlyPrice
+        ) || {};
         const hasUsageBasedEntitlements = plan.entitlements.some(
           (entitlement) => !!entitlement.priceBehavior
         );
@@ -16718,7 +16789,9 @@ var Plan = ({
                           const {
                             price: entitlementPrice,
                             currency: entitlementCurrency
-                          } = (period === "month" ? entitlement.meteredMonthlyPrice : period === "year" && entitlement.meteredYearlyPrice) || {};
+                          } = getBillingPrice(
+                            period === "year" ? entitlement.meteredYearlyPrice : entitlement.meteredMonthlyPrice
+                          ) || {};
                           if (entitlement.priceBehavior && typeof entitlementPrice !== "number") {
                             return acc;
                           }
@@ -16962,8 +17035,11 @@ var Usage = ({ entitlements, updateQuantity, period }) => {
   const unitPriceFontSize = 0.875 * theme.typography.text.fontSize;
   const unitPriceColor = hexToHSL(theme.typography.text.color).l > 50 ? darken(theme.typography.text.color, 0.46) : lighten(theme.typography.text.color, 0.46);
   return /* @__PURE__ */ jsx18(Fragment8, { children: /* @__PURE__ */ jsx18(Flex, { $flexDirection: "column", $gap: "1rem", children: entitlements.reduce(
-    (acc, { entitlement, quantity, usage }, index) => {
+    (acc, entitlement, index) => {
       if (entitlement.priceBehavior === "pay_in_advance" && entitlement.feature) {
+        const { price, currency } = getBillingPrice(
+          period === "year" ? entitlement.meteredYearlyPrice : entitlement.meteredMonthlyPrice
+        ) || {};
         acc.push(
           /* @__PURE__ */ jsxs13(
             Flex,
@@ -17018,8 +17094,8 @@ var Usage = ({ entitlements, updateQuantity, period }) => {
                         {
                           $size: "lg",
                           type: "number",
-                          value: quantity,
-                          min: usage,
+                          value: entitlement.quantity,
+                          min: entitlement.usage,
                           autoFocus: true,
                           onFocus: (event) => event.target.select(),
                           onChange: (event) => {
@@ -17039,12 +17115,12 @@ var Usage = ({ entitlements, updateQuantity, period }) => {
                           $weight: theme.typography.text.fontWeight,
                           $color: unitPriceColor,
                           children: [
-                            quantity < usage && /* @__PURE__ */ jsxs13("span", { style: { color: "#DB6669" }, children: [
+                            entitlement.quantity < entitlement.usage && /* @__PURE__ */ jsxs13("span", { style: { color: "#DB6669" }, children: [
                               t2("Cannot downgrade entitlement"),
                               " "
                             ] }),
                             t2("Currently using", {
-                              quantity: usage,
+                              quantity: entitlement.usage,
                               unit: getFeatureName(entitlement.feature)
                             })
                           ]
@@ -17068,8 +17144,8 @@ var Usage = ({ entitlements, updateQuantity, period }) => {
                           $color: theme.typography.text.color,
                           children: [
                             formatCurrency(
-                              ((period === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.price || 0) * quantity,
-                              (period === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.currency
+                              (price ?? 0) * entitlement.quantity,
+                              currency
                             ),
                             /* @__PURE__ */ jsxs13("sub", { children: [
                               "/",
@@ -17086,10 +17162,7 @@ var Usage = ({ entitlements, updateQuantity, period }) => {
                           $weight: theme.typography.text.fontWeight,
                           $color: unitPriceColor,
                           children: [
-                            formatCurrency(
-                              (period === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.price || 0,
-                              (period === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.currency
-                            ),
+                            formatCurrency(price ?? 0, currency),
                             /* @__PURE__ */ jsxs13("sub", { children: [
                               "/",
                               getFeatureName(entitlement.feature, 1),
@@ -17116,6 +17189,22 @@ var Usage = ({ entitlements, updateQuantity, period }) => {
 
 // src/components/shared/checkout-dialog/CheckoutDialog.tsx
 import { jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
+var createActiveUsageBasedEntitlementsReducer = (entitlements, period) => (acc, entitlement) => {
+  if (entitlement.priceBehavior && (period === "month" && entitlement.meteredMonthlyPrice || period === "year" && entitlement.meteredYearlyPrice)) {
+    const featureUsage = entitlements.find(
+      (usage2) => usage2.feature?.id === entitlement.feature?.id
+    );
+    const allocation = featureUsage?.allocation || 0;
+    const usage = featureUsage?.usage || 0;
+    acc.push({
+      ...entitlement,
+      allocation,
+      usage,
+      quantity: allocation
+    });
+  }
+  return acc;
+};
 var CheckoutDialog = ({ top = 0 }) => {
   const { t: t2 } = useTranslation();
   const theme = nt();
@@ -17149,34 +17238,21 @@ var CheckoutDialog = ({ top = 0 }) => {
       )
     }))
   );
-  const createActiveUsageBasedEntitlementsReducer = useCallback8(
-    (period = planPeriod) => (acc, entitlement) => {
-      if (entitlement.priceBehavior && (period === "month" && entitlement.meteredMonthlyPrice || period === "year" && entitlement.meteredYearlyPrice)) {
-        const featureUsage = data.featureUsage?.features.find(
-          (usage2) => usage2.feature?.id === entitlement.feature?.id
-        );
-        const allocation = featureUsage?.allocation ?? 0;
-        const usage = featureUsage?.usage ?? 0;
-        acc.push({
-          entitlement,
-          allocation,
-          quantity: allocation,
-          usage
-        });
-      }
-      return acc;
-    },
-    [planPeriod, data.featureUsage?.features]
-  );
+  const currentEntitlements = useMemo5(() => {
+    return data.featureUsage?.features || [];
+  }, [data.featureUsage?.features]);
   const [usageBasedEntitlements, setUsageBasedEntitlements] = useState7(
     () => (selectedPlan?.entitlements || []).reduce(
-      createActiveUsageBasedEntitlementsReducer(),
+      createActiveUsageBasedEntitlementsReducer(
+        currentEntitlements,
+        planPeriod
+      ),
       []
     )
   );
   const payInAdvanceEntitlements = useMemo5(
     () => usageBasedEntitlements.filter(
-      ({ entitlement }) => entitlement.priceBehavior === "pay_in_advance"
+      (entitlement) => entitlement.priceBehavior === "pay_in_advance"
     ),
     [usageBasedEntitlements]
   );
@@ -17240,7 +17316,7 @@ var CheckoutDialog = ({ top = 0 }) => {
     async (updates) => {
       const period = updates.period || planPeriod;
       const plan = updates.plan || selectedPlan;
-      const planPriceId = period === "month" ? plan?.monthlyPrice?.id : plan?.yearlyPrice?.id;
+      const planPriceId = period === "year" ? plan?.yearlyPrice?.id : plan?.monthlyPrice?.id;
       if (!api || !plan || !planPriceId) {
         return;
       }
@@ -17255,7 +17331,7 @@ var CheckoutDialog = ({ top = 0 }) => {
             addOnIds: (updates.addOns || addOns).reduce(
               (acc, addOn) => {
                 if (addOn.isSelected) {
-                  const addOnPriceId = (period === "month" ? addOn?.monthlyPrice : addOn?.yearlyPrice)?.id;
+                  const addOnPriceId = (period === "year" ? addOn?.yearlyPrice : addOn?.monthlyPrice)?.id;
                   if (addOnPriceId) {
                     acc.push({
                       addOnId: addOn.id,
@@ -17268,8 +17344,8 @@ var CheckoutDialog = ({ top = 0 }) => {
               []
             ),
             payInAdvance: (updates.payInAdvanceEntitlements || payInAdvanceEntitlements).reduce(
-              (acc, { entitlement, quantity }) => {
-                const priceId = (period === "month" ? entitlement.meteredMonthlyPrice : entitlement.meteredYearlyPrice)?.priceId;
+              (acc, { meteredMonthlyPrice, meteredYearlyPrice, quantity }) => {
+                const priceId = (period === "year" ? meteredYearlyPrice : meteredMonthlyPrice)?.priceId;
                 if (priceId) {
                   acc.push({
                     priceId,
@@ -17318,7 +17394,7 @@ var CheckoutDialog = ({ top = 0 }) => {
       }
       const period = updates.period || planPeriod;
       const entitlements = plan.entitlements.reduce(
-        createActiveUsageBasedEntitlementsReducer(period),
+        createActiveUsageBasedEntitlementsReducer(currentEntitlements, period),
         []
       );
       if (updates.plan) {
@@ -17329,16 +17405,11 @@ var CheckoutDialog = ({ top = 0 }) => {
         period,
         plan: updates.plan,
         payInAdvanceEntitlements: entitlements.filter(
-          ({ entitlement }) => entitlement.priceBehavior === "pay_in_advance"
+          ({ priceBehavior }) => priceBehavior === "pay_in_advance"
         )
       });
     },
-    [
-      planPeriod,
-      selectedPlan,
-      createActiveUsageBasedEntitlementsReducer,
-      previewCheckout
-    ]
+    [planPeriod, selectedPlan, currentEntitlements, previewCheckout]
   );
   const changePlanPeriod = useCallback8(
     (period) => {
@@ -17361,16 +17432,14 @@ var CheckoutDialog = ({ top = 0 }) => {
     (id, updatedQuantity) => {
       setUsageBasedEntitlements((prev2) => {
         const updated = prev2.map(
-          ({ entitlement, allocation, quantity, usage }) => entitlement.id === id ? {
-            entitlement,
-            allocation,
-            quantity: updatedQuantity,
-            usage
-          } : { entitlement, allocation, quantity, usage }
+          (entitlement) => entitlement.id === id ? {
+            ...entitlement,
+            quantity: updatedQuantity
+          } : entitlement
         );
         previewCheckout({
           payInAdvanceEntitlements: updated.filter(
-            ({ entitlement }) => entitlement.priceBehavior === "pay_in_advance"
+            ({ priceBehavior }) => priceBehavior === "pay_in_advance"
           )
         });
         return updated;
@@ -17499,7 +17568,7 @@ var CheckoutDialog = ({ top = 0 }) => {
                                     $size: theme.typography.heading3.fontSize,
                                     $weight: theme.typography.heading3.fontWeight,
                                     $color: theme.typography.heading3.color,
-                                    $marginBottom: "0.5rem",
+                                    style: { marginBottom: "0.5rem" },
                                     children: activeCheckoutStage.label
                                   }
                                 ),
@@ -17724,8 +17793,10 @@ var PeriodToggle = ({
   const [tooltipZIndex, setTooltipZIndex] = useState9(1);
   const savingsPercentage = useMemo6(() => {
     if (selectedPlan) {
-      const monthly = (selectedPlan?.monthlyPrice?.price || 0) * 12;
-      const yearly = selectedPlan?.yearlyPrice?.price || 0;
+      const monthlyBillingPrice = getBillingPrice(selectedPlan?.monthlyPrice);
+      const yearlyBillingPrice = getBillingPrice(selectedPlan?.yearlyPrice);
+      const monthly = (monthlyBillingPrice?.price ?? 0) * 12;
+      const yearly = yearlyBillingPrice?.price ?? 0;
       return Math.round((monthly - yearly) / monthly * 1e4) / 100;
     }
     return 0;
@@ -17776,11 +17847,11 @@ var PeriodToggle = ({
             children: /* @__PURE__ */ jsx22(
               Text,
               {
-                $flexShrink: 0,
                 $font: theme.typography.text.fontFamily,
                 $size: 15,
                 $weight: option === selectedOption ? 600 : 400,
                 $color: theme.typography.text.color,
+                style: { flexShrink: 0 },
                 children: t2("Billed", { period: adjectify(option) })
               }
             )
@@ -17840,23 +17911,9 @@ var UnsubscribeDialog = ({ top = 0 }) => {
     ),
     [data.company?.plan, planPeriod, availablePlans]
   );
+  const currentEntitlements = data.featureUsage?.features || [];
   const usageBasedEntitlements = (selectedPlan?.entitlements || []).reduce(
-    (acc, entitlement) => {
-      if (entitlement.priceBehavior && (planPeriod === "month" && entitlement.meteredMonthlyPrice || planPeriod === "year" && entitlement.meteredYearlyPrice)) {
-        const featureUsage = data.featureUsage?.features.find(
-          (usage2) => usage2.feature?.id === entitlement.feature?.id
-        );
-        const allocation = featureUsage?.allocation ?? 0;
-        const usage = featureUsage?.usage ?? 0;
-        acc.push({
-          entitlement,
-          allocation,
-          quantity: allocation,
-          usage
-        });
-      }
-      return acc;
-    },
+    createActiveUsageBasedEntitlementsReducer(currentEntitlements, planPeriod),
     []
   );
   const addOns = useMemo7(
@@ -18179,21 +18236,18 @@ var RenderLayout = ({ children }) => {
 };
 
 // src/components/layout/viewport/styles.ts
-var StyledViewport = dt(Box).attrs(({ theme }) => ({
-  $gridTemplateColumns: "repeat(1, minmax(300px, 1fr))",
-  $viewport: {
-    md: {
-      $gridTemplateColumns: `repeat(${theme.numberOfColumns}, minmax(300px, 1fr))`
-    }
-  }
-})).withConfig({
+var StyledViewport = dt.div.withConfig({
   shouldForwardProp: (prop) => !["$numberOfColumns", "numberOfColumns"].includes(prop)
 })`
   display: grid;
-
+  grid-template-columns: repeat(1, minmax(300px, 1fr));
   margin-left: auto;
   margin-right: auto;
   gap: 1rem;
+
+  @media (min-width: 768px) {
+    grid-template-columns: ${({ theme }) => lt`repeat(${theme.numberOfColumns}, minmax(300px, 1fr))`};
+  }
 `;
 
 // src/components/layout/viewport/Viewport.tsx
@@ -18254,25 +18308,11 @@ var Details = ({
   const { t: t2 } = useTranslation();
   const theme = nt();
   const { data } = useEmbed();
-  const currency = useMemo8(() => {
-    if (data.company?.plan?.planPeriod === "month") {
-      return monthlyUsageBasedPrice?.currency;
-    }
-    if (data.company?.plan?.planPeriod === "year") {
-      return yearlyUsageBasedPrice?.currency;
-    }
-  }, [
-    data.company?.plan?.planPeriod,
-    monthlyUsageBasedPrice,
-    yearlyUsageBasedPrice
-  ]);
-  const price = useMemo8(() => {
-    if (data.company?.plan?.planPeriod === "month") {
-      return monthlyUsageBasedPrice?.price;
-    }
-    if (data.company?.plan?.planPeriod === "year") {
-      return yearlyUsageBasedPrice?.price;
-    }
+  const { price, currency } = useMemo8(() => {
+    const { price: entitlementPrice, currency: entitlementCurrency } = getBillingPrice(
+      data.company?.plan?.planPeriod === "year" ? yearlyUsageBasedPrice : monthlyUsageBasedPrice
+    ) || {};
+    return { price: entitlementPrice, currency: entitlementCurrency };
   }, [
     data.company?.plan?.planPeriod,
     monthlyUsageBasedPrice,
@@ -18706,7 +18746,8 @@ Invoices.displayName = "Invoices";
 import { forwardRef as forwardRef9, useMemo as useMemo10, useRef as useRef8 } from "react";
 
 // src/components/elements/metered-features/styles.ts
-var Container4 = dt(Flex)`
+var Container4 = dt.div`
+  display: flex;
   flex-direction: column;
   gap: 1rem;
 
@@ -18814,7 +18855,9 @@ var MeteredFeatures = forwardRef9(({ className, ...rest }, ref) => {
     }, index) => {
       const limit = softLimit ?? allocation ?? 0;
       const isOverage = priceBehavior === "overage" && typeof softLimit === "number" && typeof usage === "number" && usage > softLimit;
-      const { price, currency } = (planPeriod === "month" ? monthlyUsageBasedPrice : planPeriod === "year" && yearlyUsageBasedPrice) || {};
+      const { price, currency } = getBillingPrice(
+        planPeriod === "year" ? yearlyUsageBasedPrice : monthlyUsageBasedPrice
+      ) || {};
       const progressBar = props.isVisible && typeof usage === "number" && limit > 0 && priceBehavior !== "pay_as_you_go" && /* @__PURE__ */ jsx30(
         ProgressBar,
         {
@@ -19513,7 +19556,7 @@ var PaymentMethodDetails = ({
         $zIndex: 1,
         $backgroundColor: "black",
         $opacity: 0.5,
-        children: /* @__PURE__ */ jsx33(Loader, { $size: "2xl" })
+        children: /* @__PURE__ */ jsx33(Loader, { $color: theme.primary, $size: "2xl" })
       }
     ),
     /* @__PURE__ */ jsxs26(
@@ -19677,8 +19720,10 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
   };
   const usageBasedEntitlements = (featureUsage?.features || []).reduce(
     (acc, usage) => {
-      const { price, currency } = (currentPlan?.planPeriod === "month" ? usage.monthlyUsageBasedPrice : usage.yearlyUsageBasedPrice) || {};
-      if (usage.priceBehavior && typeof price === "number") {
+      const { price, currency } = getBillingPrice(
+        currentPlan?.planPeriod === "year" ? usage.yearlyUsageBasedPrice : usage.monthlyUsageBasedPrice
+      ) || {};
+      if (usage.priceBehavior) {
         acc.push({ ...usage, price, currency });
       }
       return acc;
@@ -19701,11 +19746,14 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
   const headerPriceFontStyle = isUsageBasedPlan ? theme.typography.heading3 : theme.typography[props.header.price.fontStyle];
   return /* @__PURE__ */ jsxs27(Fragment11, { children: [
     isTrialSubscription && !willSubscriptionCancel ? /* @__PURE__ */ jsxs27(
-      Box,
+      Notice,
       {
-        $backgroundColor: isLightBackground ? "hsla(0, 0%, 0%, 0.04)" : "hsla(0, 0%, 100%, 0.04)",
+        as: Flex,
+        $flexDirection: "column",
+        $gap: "0.5rem",
+        $padding: "1.5rem",
         $textAlign: "center",
-        $padding: "1rem",
+        $backgroundColor: isLightBackground ? darken(theme.card.background, 0.04) : lighten(theme.card.background, 0.04),
         children: [
           /* @__PURE__ */ jsx34(
             Text,
@@ -19736,11 +19784,14 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
         ]
       }
     ) : willSubscriptionCancel && /* @__PURE__ */ jsxs27(
-      Box,
+      Notice,
       {
-        $backgroundColor: isLightBackground ? "hsla(0, 0%, 0%, 0.04)" : "hsla(0, 0%, 100%, 0.04)",
+        as: Flex,
+        $flexDirection: "column",
+        $gap: "0.5rem",
+        $padding: "1.5rem",
         $textAlign: "center",
-        $padding: "1rem",
+        $backgroundColor: isLightBackground ? darken(theme.card.background, 0.04) : lighten(theme.card.background, 0.04),
         children: [
           /* @__PURE__ */ jsx34(
             Text,
@@ -19753,7 +19804,7 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
               children: t2("Subscription canceled")
             }
           ),
-          /* @__PURE__ */ jsx34(
+          billingSubscription?.cancelAt && /* @__PURE__ */ jsx34(
             Text,
             {
               as: "p",
@@ -19761,14 +19812,14 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
               $size: 0.8125 * theme.typography.text.fontSize,
               $weight: theme.typography.text.fontWeight,
               $color: theme.typography.text.color,
-              children: billingSubscription?.cancelAt ? t2("Access to plan will end on", {
+              children: t2("Access to plan will end on", {
                 date: toPrettyDate(
                   new Date(billingSubscription.cancelAt * 1e3),
                   {
                     month: "numeric"
                   }
                 )
-              }) : ""
+              })
             }
           )
         ]
@@ -19960,7 +20011,7 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
                                   ":",
                                   " ",
                                   formatCurrency(
-                                    entitlement.price,
+                                    entitlement.price ?? 0,
                                     entitlement.currency
                                   ),
                                   /* @__PURE__ */ jsxs27("sub", { children: [
@@ -19982,7 +20033,7 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
                                 $color: hexToHSL(theme.typography.text.color).l > 50 ? darken(theme.typography.text.color, 0.46) : lighten(theme.typography.text.color, 0.46),
                                 children: [
                                   formatCurrency(
-                                    entitlement.price,
+                                    entitlement.price ?? 0,
                                     entitlement.currency
                                   ),
                                   /* @__PURE__ */ jsxs27("sub", { children: [
@@ -20003,7 +20054,7 @@ var PlanManager = forwardRef11(({ children, className, portal, ...rest }, ref) =
                                 $color: theme.typography.text.color,
                                 children: [
                                   formatCurrency(
-                                    entitlement.price * amount,
+                                    (entitlement.price ?? 0) * amount,
                                     entitlement.currency
                                   ),
                                   (entitlement.priceBehavior === "pay_in_advance" || entitlement.priceBehavior !== "overage") && /* @__PURE__ */ jsxs27("sub", { children: [
@@ -20183,7 +20234,9 @@ var PricingTable = forwardRef12(({ children, className, ...rest }, ref) => {
               $gap: "1rem",
               children: plans.map((plan, planIndex, self2) => {
                 const isActivePlan = plan.current && data.company?.plan?.planPeriod === selectedPeriod;
-                const { price: planPrice, currency: planCurrency } = (selectedPeriod === "month" ? plan.monthlyPrice : selectedPeriod === "year" && plan.yearlyPrice) || {};
+                const { price: planPrice, currency: planCurrency } = getBillingPrice(
+                  selectedPeriod === "year" ? plan.yearlyPrice : plan.monthlyPrice
+                ) || {};
                 const count = entitlementCounts[plan.id];
                 const isExpanded = count.limit > VISIBLE_ENTITLEMENT_COUNT;
                 const hasUsageBasedEntitlements = plan.entitlements.some(
@@ -20312,7 +20365,9 @@ var PricingTable = forwardRef12(({ children, className, ...rest }, ref) => {
                                   const {
                                     price: entitlementPrice,
                                     currency: entitlementCurrency
-                                  } = (selectedPeriod === "month" ? entitlement.meteredMonthlyPrice : selectedPeriod === "year" && entitlement.meteredYearlyPrice) || {};
+                                  } = getBillingPrice(
+                                    selectedPeriod === "year" ? entitlement.meteredYearlyPrice : entitlement.meteredMonthlyPrice
+                                  ) || {};
                                   if (entitlement.priceBehavior && typeof entitlementPrice !== "number") {
                                     return acc;
                                   }
@@ -20586,7 +20641,9 @@ var PricingTable = forwardRef12(({ children, className, ...rest }, ref) => {
               $gap: "1rem",
               children: addOns.map((addOn, addOnIndex) => {
                 const isActiveAddOn = addOn.current && selectedPeriod === data.company?.addOns.find((a2) => a2.id === addOn.id)?.planPeriod;
-                const { price: addOnPrice, currency: addOnCurrency } = (selectedPeriod === "month" ? addOn.monthlyPrice : selectedPeriod === "year" && addOn.yearlyPrice) || {};
+                const { price: addOnPrice, currency: addOnCurrency } = getBillingPrice(
+                  selectedPeriod === "year" ? addOn.yearlyPrice : addOn.monthlyPrice
+                ) || {};
                 return /* @__PURE__ */ jsxs28(
                   Flex,
                   {
@@ -21062,7 +21119,7 @@ var Loading = () => {
       $alignItems: "center",
       $justifyContent: "center",
       $padding: `${theme.card.padding / TEXT_BASE_SIZE}rem`,
-      children: /* @__PURE__ */ jsx38(Loader, { $size: "2xl", $color: "#194BFB" })
+      children: /* @__PURE__ */ jsx38(Loader, { $color: "#194BFB", $size: "2xl" })
     }
   );
 };
@@ -21168,6 +21225,7 @@ export {
   MeteredFeatures,
   Modal,
   ModalHeader,
+  Notice,
   PaymentMethod,
   PaymentMethodDetails,
   PlanManager,