@fluid-app/portal-sdk 0.1.482 → 0.1.484

package/dist/{SubscriptionsScreen-ClSfyR6N.cjs → SubscriptionsScreen-DIxkq3nu.cjs}

@@ -68,6 +68,6 @@ require("./use-portal-card-add-3ds-flow-DPX94F0H.cjs");
 require("./display-C4lR3Fx6.cjs");
 require("./Combobox-CSQBMeAc.cjs");
 require("./prop-types-RKmVoT8k.cjs");
-const require_SubscriptionsScreen = require("./SubscriptionsScreen-DoyP5YBP.cjs");
+const require_SubscriptionsScreen = require("./SubscriptionsScreen-DPymXVC4.cjs");
 exports.SubscriptionsScreen = require_SubscriptionsScreen.SubscriptionsScreen;
 exports.subscriptionsScreenPropertySchema = require_SubscriptionsScreen.subscriptionsScreenPropertySchema;

package/dist/{SubscriptionsScreen-DoyP5YBP.cjs → SubscriptionsScreen-DPymXVC4.cjs}

@@ -2680,22 +2680,30 @@ function formatTime(dateString, timezone, locale = "en-US") {
 		return "";
 	}
 }
-function getNextBillDisplay(subscription, labels = {
+function getNextBillDisplay(nextBillDate, displayStatus, labels = {
 	cancelled: "Cancelled",
 	completed: "Completed",
 	paused: "Paused",
 	notAvailable: "N/A"
 }, locale = "en-US") {
-	if (subscription?.billing_cycle_limit_reached) return labels.completed;
-	if (subscription?.status === "cancelled") return labels.cancelled;
-	if (subscription?.next_bill_date) return formatDate(subscription.next_bill_date, locale);
-	if (subscription?.status === "paused") return labels.paused;
+	if (displayStatus === "completed") return labels.completed;
+	if (displayStatus === "cancelled") return labels.cancelled;
+	if (nextBillDate) return formatDate(nextBillDate, locale);
+	if (displayStatus === "paused") return labels.paused;
 	return labels.notAvailable;
 }
 //#endregion
 //#region ../../subscriptions/core/src/utils/subscription-actions.ts
+/**
+* The one rule for a completed subscription: its current plan's
+* billing-cycle limit is reached. Every "completed" presentation and
+* gate reads this, so a new terminal condition lands here once.
+*/
+function isSubscriptionCompleted(subscription) {
+	return subscription?.billing_cycle_limit_reached === true;
+}
 function getSubscriptionDisplayStatus(subscription) {
-	return subscription.billingCycleLimitReached === true ? "completed" : subscription.status;
+	return isSubscriptionCompleted(subscription) ? "completed" : subscription.status;
 }
 function hasPendingSubscriptionSkip(skips, today = /* @__PURE__ */ new Date()) {
 	if (!skips?.length) return false;
@@ -2707,13 +2715,11 @@ function hasPendingSubscriptionSkip(skips, today = /* @__PURE__ */ new Date()) {
 	});
 }
 function getSubscriptionActionPolicy(subscription) {
-	if (subscription.billingCycleLimitReached === true) return {
-		primary: null,
-		order: [],
-		menu: [],
-		recovery: null
-	};
-	if (subscription.status === "active") {
+	const status = getSubscriptionDisplayStatus({
+		status: subscription.status,
+		billing_cycle_limit_reached: subscription.billingCycleLimitReached
+	});
+	if (status === "active") {
 		const skipAllowanceAvailable = subscription.maxSkips == null || (subscription.skippedCount ?? 0) < subscription.maxSkips;
 		const canSkip = subscription.allowSkipping === true && subscription.nextBillDate != null && skipAllowanceAvailable;
 		const order = [];
@@ -2728,19 +2734,19 @@ function getSubscriptionActionPolicy(subscription) {
 			recovery: null
 		};
 	}
-	if (subscription.status === "paused") return {
+	if (status === "paused") return {
 		primary: "resume_subscription",
 		order: [],
 		menu: ["cancel_subscription"],
 		recovery: null
 	};
-	if (subscription.status === "cancelled") return {
+	if (status === "cancelled") return {
 		primary: "reactivate_subscription",
 		order: [],
 		menu: [],
 		recovery: null
 	};
-	if (subscription.status === "past_due") {
+	if (status === "past_due") {
 		const isExhausted = subscription.nextRetryAt == null;
 		const secondary = subscription.canChangePaymentMethod ? "change_payment_method" : null;
 		return {
@@ -2756,13 +2762,13 @@ function getSubscriptionActionPolicy(subscription) {
 			}
 		};
 	}
-	if (subscription.status === "completed") return {
+	if (status === "completed") return {
 		primary: null,
 		order: [],
 		menu: [],
 		recovery: null
 	};
-	if (["pending", "trial"].includes(subscription.status)) return {
+	if (["pending", "trial"].includes(status)) return {
 		primary: null,
 		order: [],
 		menu: ["cancel_subscription"],
@@ -6487,12 +6493,14 @@ function SubscriptionItemsSection({ subscription, displayQuantity, displayNextBi
 	const variant = subscription.variant;
 	const product = variant?.product;
 	const quantity = displayQuantity ?? subscription.quantity;
+	const displayStatus = getSubscriptionDisplayStatus(subscription);
+	const paymentFailed = displayStatus === "past_due";
 	const quantityInputId = `subscription-${subscription.subscription_token}-quantity`;
 	const pricing = computeSubscriptionPricing(subscription);
 	const subtotal = formatCurrency(pricing.subtotalUnit * quantity);
 	const totalPrice = formatCurrency(pricing.totalUnit * quantity);
 	const effectiveNextBillDate = displayNextBillDate ?? subscription.next_bill_date;
-	const nextOrderTimeOfDay = subscription.billing_cycle_limit_reached ? "" : formatTime(effectiveNextBillDate, subscription.timezone, locale);
+	const nextOrderTimeOfDay = displayStatus === "completed" ? "" : formatTime(effectiveNextBillDate, subscription.timezone, locale);
 	const nextBillDisplayLabels = {
 		cancelled: t("date_cancelled"),
 		completed: t("list_status_completed"),
@@ -6516,14 +6524,11 @@ function SubscriptionItemsSection({ subscription, displayQuantity, displayNextBi
 							children: [
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									className: "text-muted-foreground mb-1 text-sm",
-									children: subscription.status === "past_due" && !subscription.billing_cycle_limit_reached ? t("payment_failed_on") : t("next_order_date")
+									children: paymentFailed ? t("payment_failed_on") : t("next_order_date")
 								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									className: "text-foreground text-2xl font-bold",
-									children: subscription.status === "past_due" && !subscription.billing_cycle_limit_reached ? subscription.last_failed_at ? formatOptionalDate(subscription.last_failed_at, locale) : "—" : getNextBillDisplay(displayNextBillDate ? {
-										...subscription,
-										next_bill_date: displayNextBillDate
-									} : subscription, nextBillDisplayLabels, locale)
+									children: paymentFailed ? subscription.last_failed_at ? formatOptionalDate(subscription.last_failed_at, locale) : "—" : getNextBillDisplay(effectiveNextBillDate, displayStatus, nextBillDisplayLabels, locale)
 								}),
 								nextOrderTimeOfDay && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 									className: "text-muted-foreground mt-1 text-xs",
@@ -6654,10 +6659,7 @@ function SubscriptionManagementSection({ subscription, actionPolicy, isMutating,
 	const plan = subscription.subscription_plan;
 	const quantity = subscription.quantity;
 	const totalPrice = formatCurrency(subscription.price * quantity);
-	const displayStatus = getSubscriptionDisplayStatus({
-		status: subscription.status,
-		billingCycleLimitReached: subscription.billing_cycle_limit_reached
-	});
+	const displayStatus = getSubscriptionDisplayStatus(subscription);
 	const cadenceKey = getCadenceKey(plan.billing_interval_unit);
 	const interval = plan.billing_interval;
 	const unitKeys = UNIT_KEYS[plan.billing_interval_unit.toLowerCase()];
@@ -6852,7 +6854,7 @@ function SubscriptionManagementSection({ subscription, actionPolicy, isMutating,
 							subscriptionToken: subscription.subscription_token,
 							customerId: subscription.customer?.id ?? 0,
 							countryCode: subscription.address?.country_code ?? "US",
-							disabled: subscription.billing_cycle_limit_reached
+							disabled: isSubscriptionCompleted(subscription)
 						}) : subscription.address && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "border-border mb-6 border-b pb-4",
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -6989,7 +6991,7 @@ function SubscriptionDetail({ token, onNotFound, onError, onSuccess, onMutationE
 	const { data, isLoading, error } = useSubscription(token);
 	const subscription = data?.subscription;
 	const customerId = subscription?.customer?.id ?? 0;
-	const waiverPreviewEnabled = subscription?.status === "past_due" && subscription.billing_cycle_limit_reached !== true && subscription.next_retry_at == null;
+	const waiverPreviewEnabled = subscription?.status === "past_due" && !isSubscriptionCompleted(subscription) && subscription.next_retry_at == null;
 	const waiverPreviewQuery = useFailedCycleWaiverPreview(token, { enabled: waiverPreviewEnabled });
 	const isWaiverPreviewLoading = waiverPreviewEnabled && waiverPreviewQuery.isFetching;
 	const waiverPreview = waiverPreviewQuery.data?.failed_cycle_waiver;
@@ -7149,7 +7151,8 @@ function SubscriptionDetail({ token, onNotFound, onError, onSuccess, onMutationE
 	if (isLoading) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SubscriptionDetailSkeleton, {});
 	if (!subscription) return null;
 	const plan = subscription.subscription_plan;
-	const isActive = subscription.status === "active" && !subscription.billing_cycle_limit_reached;
+	const displayStatus = getSubscriptionDisplayStatus(subscription);
+	const isActive = displayStatus === "active";
 	const actionPolicy = getSubscriptionActionPolicy({
 		status: subscription.status,
 		billingCycleLimitReached: subscription.billing_cycle_limit_reached,
@@ -7168,7 +7171,7 @@ function SubscriptionDetail({ token, onNotFound, onError, onSuccess, onMutationE
 	const childPaymentRecoveryDisabled = childPaymentRecoveryToken === token;
 	const waiverMutationPending = waiverMutation.isPending && waiverMutation.variables?.subscriptionToken === token;
 	const aggregateRecoveryDisabled = directParentRecoveryDisabled || childPaymentRecoveryDisabled || waiverMutationPending;
-	const paymentMethodDisabled = subscription.billing_cycle_limit_reached || directParentRecoveryDisabled || waiverMutationPending || independentParentMutationDisabled;
+	const paymentMethodDisabled = isSubscriptionCompleted(subscription) || directParentRecoveryDisabled || waiverMutationPending || independentParentMutationDisabled;
 	const isMutating = independentParentMutationDisabled || aggregateRecoveryDisabled;
 	const handlePauseConfirm = (selection) => {
 		const pauseParams = { customerId };
@@ -7225,7 +7228,7 @@ function SubscriptionDetail({ token, onNotFound, onError, onSuccess, onMutationE
 		}, { onSuccess: () => setShowReactivateModal(false) });
 	};
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-		subscription.status === "past_due" && !subscription.billing_cycle_limit_reached && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		displayStatus === "past_due" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 			className: "mb-4 px-2 sm:px-0 lg:mb-6",
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PastDueBanner, {
 				productTitle: subscription.variant?.product?.title ?? null,
@@ -7545,7 +7548,7 @@ async function invalidateSubscriptionPaymentRecoveryCache(queryClient, subscript
 }
 async function completeSubscriptionPaymentUpdate(args) {
 	const cached = args.queryClient.getQueryData(subscriptionsKeys.detail(args.updatedSubscriptionToken));
-	if (cached?.subscription.status === "past_due" && cached.subscription.billing_cycle_limit_reached !== true) {
+	if (cached?.subscription.status === "past_due" && !isSubscriptionCompleted(cached.subscription)) {
 		args.queueRetry(args.updatedSubscriptionToken);
 		return;
 	}
@@ -8336,7 +8339,6 @@ function PortalSubscriptionShippingAddressSectionInner({ addressId, address: cur
 				addressList: addresses,
 				selectedAddressId: addressId ?? 0,
 				onSelectAddress: (addr) => {
-					if (disabled) return;
 					if (addr.id === addressId) return;
 					updateSubscription.mutate({
 						subscriptionToken,
@@ -8344,7 +8346,6 @@ function PortalSubscriptionShippingAddressSectionInner({ addressId, address: cur
 					});
 				},
 				onAddAddressClick: () => {
-					if (disabled) return;
 					setEditingAddress(null);
 					setIsFormDialogOpen(true);
 				},
@@ -8614,4 +8615,4 @@ Object.defineProperty(exports, "subscriptionsScreenPropertySchema", {
 	}
 });
 
-//# sourceMappingURL=SubscriptionsScreen-DoyP5YBP.cjs.map
+//# sourceMappingURL=SubscriptionsScreen-DPymXVC4.cjs.map