@stigg/react-sdk 4.2.1 → 4.2.2

package/dist/components/paywall/utils/computeDefaultBillingPeriod.d.ts

@@ -1,5 +1,5 @@
-import { BillingPeriod, Plan } from '@stigg/js-client-sdk';
-export declare function computeBillingPeriods(plans: Plan[], preferredBillingPeriod?: BillingPeriod): {
+import { BillingPeriod, Plan, Subscription } from '@stigg/js-client-sdk';
+export declare function computeBillingPeriods(plans: Plan[], activeSubscriptions?: Subscription[] | null, preferredBillingPeriod?: BillingPeriod): {
     defaultBillingPeriod: BillingPeriod;
     availableBillingPeriods: BillingPeriod[];
 };

package/dist/react-sdk.cjs.development.js

@@ -687,14 +687,14 @@ function getSelectedTier(plan, billingPeriod, currentSubscription, selectedTierB
       var tieredPrice = currentSubscription.prices.find(function (subscriptionPrice) {
         var _subscriptionPrice$fe;
 
-        return subscriptionPrice.pricingModel == Stigg.BillingModel.PerUnit && subscriptionPrice.billingPeriod == billingPeriod && subscriptionPrice.tiersMode && ((_subscriptionPrice$fe = subscriptionPrice.feature) == null ? void 0 : _subscriptionPrice$fe.featureId) === featureId;
+        return subscriptionPrice.pricingModel == Stigg.BillingModel.PerUnit && subscriptionPrice.tiersMode && ((_subscriptionPrice$fe = subscriptionPrice.feature) == null ? void 0 : _subscriptionPrice$fe.featureId) === featureId;
       });
 
       if (tieredPrice) {
-        var customerTier = tieredPrice.tiers.find(function (tier) {
+        var customerTier = price.tiers.find(function (tier) {
           return tier.upTo === tieredPrice.feature.unitQuantity;
         });
-        currentTier = customerTier || tieredPrice.tiers[0];
+        currentTier = customerTier || price.tiers[0];
       }
     }
 
@@ -2849,7 +2849,7 @@ var useStiggContext = function useStiggContext() {
   return ctx;
 };
 
-function computeBillingPeriods(plans, preferredBillingPeriod) {
+function computeBillingPeriods(plans, activeSubscriptions, preferredBillingPeriod) {
   var billingPeriods = plans.flatMap(function (x) {
     return x.pricePoints;
   }).map(function (x) {
@@ -2861,7 +2861,17 @@ function computeBillingPeriods(plans, preferredBillingPeriod) {
 
   if (preferredBillingPeriod && availableBillingPeriods.includes(preferredBillingPeriod)) {
     defaultBillingPeriod = preferredBillingPeriod;
-  } else {
+  } else if (activeSubscriptions) {
+    var activeSubscription = activeSubscriptions.find(function (x) {
+      return x.status == Stigg.SubscriptionStatus.Active;
+    });
+
+    if (activeSubscription && activeSubscription.prices.length > 0) {
+      defaultBillingPeriod = activeSubscription == null ? void 0 : activeSubscription.prices[0].billingPeriod;
+    }
+  }
+
+  if (!defaultBillingPeriod) {
     defaultBillingPeriod = (counts[Stigg.BillingPeriod.Monthly] || 0) > (counts[Stigg.BillingPeriod.Annually] || 0) ? Stigg.BillingPeriod.Monthly : Stigg.BillingPeriod.Annually;
   }
 
@@ -3163,7 +3173,7 @@ function useLoadPaywallData(_ref) {
 
               case 6:
                 paywallResult = _context.sent;
-                _computeBillingPeriod = computeBillingPeriods(paywallResult.plans, preferredBillingPeriod), _availableBillingPeriods = _computeBillingPeriod.availableBillingPeriods, defaultBillingPeriod = _computeBillingPeriod.defaultBillingPeriod;
+                _computeBillingPeriod = computeBillingPeriods(paywallResult.plans, paywallResult.activeSubscriptions, preferredBillingPeriod), _availableBillingPeriods = _computeBillingPeriod.availableBillingPeriods, defaultBillingPeriod = _computeBillingPeriod.defaultBillingPeriod;
                 setPaywall(paywallResult);
                 setAvailableBillingPeriods(_availableBillingPeriods);
                 setSelectedBillingPeriod(defaultBillingPeriod);