Show subscription settings section either when subscription purchase is possible or user is authenticated #2922
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…is possible or user is authenticated
github-actions
bot
added
the
bot: not in app board
miasma13
removed
the
bot: not in app board
samsymons
approved these changes
Jun 7, 2024
samsymons
added a commit
that referenced
this pull request
Jun 7, 2024
* main: (34 commits) Release 7.122.1-0 (#2932) Fix widgets init due to crash of availability check inside builder on iOS 16 (#2931) Show subscription settings section either when subscription purchase is possible or user is authenticated (#2922) Release 7.123.0-1 (#2928) Do not refresh UI only if AutoClear was triggered (#2924) Do not refresh UI only if AutoClear was triggered (#2924) Clean up subscription state caching in settings logic (#2925) Force Omni Bar cancellation when submitting a query (#2923) Hide 'Set your address bar position' for iPad (#2913) Select correct access group for SubscriptionTokenKeychainStorage (#2918) Remove VPN waitlist feature flags and access controller (#2919) Remove usage of token store from iOS VPN (#2892) Update autoconsent to v10.9.0 (#2908) Load child Privacy Pro views lazily (#2917) Surface specific XPC & login item errors on macOS (#2872) Removing the temporary password manager survey code (#2910) Release 7.123.0-0 (#2915) Use better wording for history autocomplete description (#2914) Additional Privacy Pro RMF changes (#2911) Bump BSK - No iOS Changes, Enables macOS DBP Changes (#2877) ...
samsymons
added a commit
that referenced
this pull request
Jun 9, 2024
# By Michal Smaga (6) and others # Via Michal Smaga (3) and GitHub (1) * main: DBP: Bump C-S-S version to 5.19.0 (#2927) Release 7.123.0-2 (#2933) Fix widgets init due to crash of availability check inside builder on iOS 16 (#2931) Release 7.122.1-0 (#2932) Fix widgets init due to crash of availability check inside builder on iOS 16 (#2931) Show subscription settings section either when subscription purchase is possible or user is authenticated (#2922) Release 7.123.0-1 (#2928) Do not refresh UI only if AutoClear was triggered (#2924) Clean up subscription state caching in settings logic (#2925) Force Omni Bar cancellation when submitting a query (#2923) Remove Privacy Pro line from release notes (#2902) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/0/414709148257752/1207502776093440/f
Description:
Logic for displaying Privacy Pro section in settings always relies on canPurchase value (base on availability of subscription products for your region in the App Store). This check is even applied when the subscription was already purchased/activated on this device.
This logic is not aligned with macOS where we check for canPurchase only for unauthenticated state, otherwise if the user is already authenticated (we stored their accessToken) the Privacy Pro is made accessible in the UI.
Steps to test this PR:
canPurchaseto be false by launching the app while device is offline or hardcode it inSettingsViewModel.swiftin line 768:state.subscription.canPurchase = false // subscriptionManager.canPurchasecanPurchase)canPurchaseby undoing step 3.Device Testing:
Internal references:
Software Engineering Expectations
Technical Design Template