Skip to content

Tune up display of promotional purchases #2778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vegaro wants to merge 2 commits into
base: fix-caret-click
Choose a base branch
from
Open

Tune up display of promotional purchases #2778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
874ba4c
fix promotinoals
vegaro Oct 24, 2025
673ffb4
Merge branch 'fix-caret-click' into cesar/fix-promotionals
vegaro Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .../revenuecat/purchases/ui/revenuecatui/customercenter/data/CustomerCenterConfigTestData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,23 @@ internal object CustomerCenterConfigTestData {
)

val purchaseInformationPromotional = PurchaseInformation(
title = "rc_promo_Test1_lifetime",
title = "Entitlement",
pricePaid = PriceDetails.Free,
expirationOrRenewal = ExpirationOrRenewal.Expiration("April 24th, 2225"),
expirationOrRenewal = ExpirationOrRenewal.Expiration("October 25th, 2025"),
store = Store.PROMOTIONAL,
managementURL = null,
product = null,
isSubscription = false,
isExpired = false,
isTrial = false,
isCancelled = true,
isLifetime = true,
)

val purchaseInformationPromotionalLifetime = PurchaseInformation(
title = "Entitlement",
pricePaid = PriceDetails.Free,
expirationOrRenewal = ExpirationOrRenewal.Expiration("September 6th, 2225"),
store = Store.PROMOTIONAL,
managementURL = null,
product = null,
Expand Down
6 changes: 6 additions & 0 deletions .../revenuecat/purchases/ui/revenuecatui/customercenter/views/PurchaseInformationCardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ private fun getSubtitle(
purchaseInformation: PurchaseInformation,
localization: CustomerCenterConfigData.Localization,
): String? {
// Lifetime purchases should not show expiration dates
if (purchaseInformation.isLifetime) {
return getPrice(purchaseInformation, localization)
}

return when (purchaseInformation.expirationOrRenewal) {
is ExpirationOrRenewal.Expiration ->
purchaseInformation.expirationString(purchaseInformation.expirationOrRenewal.date, localization)
Expand Down Expand Up @@ -182,6 +187,7 @@ private class PurchaseInformationProvider : PreviewParameterProvider<PurchaseInf
CustomerCenterConfigTestData.purchaseInformationYearlyExpired,
CustomerCenterConfigTestData.purchaseInformationFreeTrial,
CustomerCenterConfigTestData.purchaseInformationPromotional,
CustomerCenterConfigTestData.purchaseInformationPromotionalLifetime,
CustomerCenterConfigTestData.purchaseInformationLifetime,
CustomerCenterConfigTestData.purchaseInformationMonthlyRenewing.copy(
title = "Monthly long subscription name that overflows",
Expand Down
5 changes: 4 additions & 1 deletion ...om/revenuecat/purchases/ui/revenuecatui/customercenter/views/RelevantPurchasesListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.revenuecat.purchases.Store
import com.revenuecat.purchases.customercenter.CustomerCenterConfigData
import com.revenuecat.purchases.customercenter.CustomerCenterConfigData.HelpPath
import com.revenuecat.purchases.ui.revenuecatui.customercenter.CustomerCenterConstants
Expand Down Expand Up @@ -45,7 +46,9 @@ internal fun RelevantPurchasesListView(
.verticalScroll(rememberScrollState()),
horizontalAlignment = Alignment.Start,
) {
val subscriptions = purchases.filter { it.isSubscription }.toSet()
val subscriptions = purchases.filter {
it.isSubscription || (it.store == Store.PROMOTIONAL && !it.isLifetime)
}.toSet()
val nonSubscriptions = (purchases - subscriptions).toSet()

PurchaseListSection(
Expand Down