Skip to content
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

Privacy Pro Subscriptions: Update some internal models and methods #5402

Merged
merged 14 commits into from
Dec 21, 2024
Merged

Privacy Pro Subscriptions: Update some internal models and methods #5402

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5184617
Changed SubscriptionOffer objects to scale better
nalcalag Dec 17, 2024
4aba16b
fix tests error
nalcalag Dec 18, 2024
78411ea
Moved back ROW FF check to SubscriptionsManager
nalcalag Dec 19, 2024
e766559
update tests
nalcalag Dec 19, 2024
fc9fe50
fix RealSubscriptionManager tests
lmac012 Dec 19, 2024
d3656e7
don't assume monthly plan is returned as first item on the list
lmac012 Dec 20, 2024
f75d76c
Fix (Legacy)ProSettingViewModelTest
lmac012 Dec 20, 2024
494b8f1
Fixed getSubscriptionOptions() implementation where we were not sendi…
nalcalag Dec 20, 2024
eeeeb2c
Added FE models updates
nalcalag Dec 20, 2024
0f00ed6
Changed free trial check
nalcalag Dec 20, 2024
18d506f
fix tests
lmac012 Dec 20, 2024
1767818
Remove Json parameter that is not needed anymore
nalcalag Dec 20, 2024
ce6aa17
Updated OfferJson type parameter to String
nalcalag Dec 20, 2024
c64fcff
Removed redundant line
nalcalag Dec 20, 2024
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
Prev Previous commit
Next Next commit
Remove Json parameter that is not needed anymore
  • Loading branch information
@nalcalag
nalcalag committed Dec 20, 2024
commit 17678188a009a792c7293369ca2efab485ee8853
2 changes: 0 additions & 2 deletions ...s-impl/src/main/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionWebViewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ class SubscriptionWebViewViewModel @Inject constructor(
OfferJson(
type = offerType,
id = it,
displayPrice = offer.pricingPhases.first().formattedPrice,
durationInDays = offer.pricingPhases.first().getBillingPeriodInDays(),
isUserEligible = true, // TODO Noelia: Need to check if they already had a free trial before to return false
)
Expand Down Expand Up @@ -361,7 +360,6 @@ class SubscriptionWebViewViewModel @Inject constructor(
data class OfferJson(
val type: OfferType,
val id: String,
val displayPrice: String,
val durationInDays: Int?,
val isUserEligible: Boolean,
)
Expand Down
Loading