-
Notifications
You must be signed in to change notification settings - Fork 921
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.
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
Update Settings: Update ITR settings item #5398
Merged
mikescamell
merged 11 commits into
develop
from
feature/mike/update-settings/update-itr-item
Dec 19, 2024
Merged
Update Settings: Update ITR settings item #5398
mikescamell
merged 11 commits into
develop
from
feature/mike/update-settings/update-itr-item
Dec 19, 2024
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
28 tasks
This stack of pull requests is managed by Graphite. Learn more about stacking. |
24 tasks
...java/com/duckduckgo/subscriptions/impl/settings/views/LegacyLegacyItrSettingViewModelTest.kt
Outdated
Show resolved
Hide resolved
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
December 17, 2024 09:17
9b7fcfa
to
1cf3f4e
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
from
December 17, 2024 09:17
822cf55
to
7743151
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
December 17, 2024 09:24
1cf3f4e
to
ad94878
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
from
December 17, 2024 09:25
7743151
to
46aff6f
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
December 17, 2024 09:30
ad94878
to
955be80
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
from
December 17, 2024 09:30
8fb5be4
to
116c982
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
December 18, 2024 09:50
955be80
to
b9ccd81
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
from
December 18, 2024 09:51
116c982
to
9e7f2b6
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
December 18, 2024 17:31
b9ccd81
to
2c2bed6
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
from
December 18, 2024 17:32
9e7f2b6
to
2098004
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
December 18, 2024 18:52
2c2bed6
to
28c7763
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
2 times, most recently
from
December 18, 2024 19:42
ebbd783
to
ce47500
Compare
malmstein
approved these changes
Dec 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Base automatically changed from
feature/mike/update-settings/update-pir-item
to
develop
December 19, 2024 16:23
We'll use this for ITR as well
The ITR setting is now displayed based on the current status of the product subscription. It will be: - Hidden if the user is ineligible or signed out - Expired if the subscription is inactive or expired - Activating if the subscription is waiting for activation - Subscribed if the subscription is active ProductSubscriptionManager now takes a vararg of Products as we have US and ROW ITR products
some how too many legacies :D
mikescamell
force-pushed
the
feature/mike/update-settings/update-itr-item
branch
from
December 19, 2024 16:28
ce47500
to
35da2fc
Compare
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/1207908166761516/1208966262488273/f
Description
ProductSubscriptionManager
to handle status checks for multiple productsSteps to test this PR
Prerequisite: Enable
newSettings
feature togglePrerequisite: Apply the patch in the Asana task
Note: All PPro items should be seen in this PR, that is VPN, PIR, and ITR.
ITR Subscribed
RealSubscriptions
change ln 77 toreturn flowOf(listOf(NetP, PIR, ITR))
Unsubscribed
SubscriptionManager
change ln 442 toreturn SubscriptionStatus.UNKNOWN
ITR Expired
SubscriptionManager
change ln 442 toreturn SubscriptionStatus.EXPIRED
PPro Activating
SubscriptionManager
change ln 442 toreturn SubscriptionStatus.WAITING
No Entitlement
SubscriptionManager
change ln 442 toreturn SubscriptionStatus.AUTO_RENEWABLE
RealSubscriptions
change ln 77 toreturn flowOf(listOf())
Legacy Support
newSettings
UI changes