Skip to content

fix(adapty-ui): render product text on first composition before produ… #45

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
Taha-Firoz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(adapty-ui): render product text on first composition before produ… #45

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
017e21b
fix(adapty-ui): render product text on first composition before produ…
Taha-Firoz May 6, 2026
733327a
Isolate PaywallViewModel per AdaptyPaywallView instance
Taha-Firoz May 9, 2026
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
6 changes: 4 additions & 2 deletions adapty-ui/src/main/java/com/adapty/ui/AdaptyPaywallView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,21 @@ public class AdaptyPaywallView @JvmOverloads constructor(
defStyleAttr: Int = 0,
) : AbstractComposeView(context, attrs, defStyleAttr) {

private val instanceKey: String = UUID.randomUUID().toString()

private val viewModel: PaywallViewModel? by lazy {
val viewModelStoreOwner = findViewTreeViewModelStoreOwner()
?: run {
log(ERROR) { "$LOG_PREFIX AdaptyPaywallView (${hashCode()}) rendering error: No ViewModelStoreOwner found" }
return@lazy null
}
PaywallViewModelArgs.create(
"${UUID.randomUUID().toString().hashCode()}",
"${instanceKey.hashCode()}",
null,
context.getCurrentLocale(),
)?.let { args ->
val factory = PaywallViewModelFactory(args)
ViewModelProvider(viewModelStoreOwner, factory)[PaywallViewModel::class.java]
ViewModelProvider(viewModelStoreOwner, factory)[instanceKey, PaywallViewModel::class.java]
}
}

Expand Down
4 changes: 2 additions & 2 deletions adapty-ui/src/main/java/com/adapty/ui/internal/text/TextResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ internal class TextResolver(
val desiredProductId = stringId.productId?.takeIf { it.isNotEmpty() }
?: state[getProductGroupKey(stringId.productGroupId)] as? String
val desiredLocalText = if (!desiredProductId.isNullOrEmpty()) {
val product = products[desiredProductId] ?: return StringWrapper.EMPTY
val paymentModeStr = when(product.firstDiscountOfferOrNull()?.paymentMode) {
val product = products[desiredProductId]
val paymentModeStr = when(product?.firstDiscountOfferOrNull()?.paymentMode) {
PaymentMode.FREE_TRIAL -> "free_trial"
PaymentMode.PAY_AS_YOU_GO -> "pay_as_you_go"
PaymentMode.PAY_UPFRONT -> "pay_up_front"
Expand Down