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

Jump to bottom

Fix expiry prompt uninstall button selection state #2475

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Fix expiry prompt uninstall button selection state #2475

merged 1 commit into from
Mar 22, 2024

Conversation

graeme
Copy link
Collaborator

@graeme graeme commented Mar 21, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/0/1206887263279894/f

Description:

The uninstall button on the VPN entitlements expiry view has no selection state. Update it so the colour changes to match the background selection state of the normal default button style. See video in task for context.

Steps to test this PR:

  1. Hardcode NetworkProtectionStatusViewModel.shouldShowSubscriptionExpired to true
  2. Comment out L: 161 (which observes the entitlements validity
  3. Authenticate (either invite code or subs) the VPN so you can see the controls
  4. Observe the Uninstall button and select it to see it’s selection state
  5. It should change colour to be slightly more transparent
Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

@github-actions github-actions bot added bot: not in app board Added by automation for pull requests with tasks not added to macOS App Board Asana project and removed bot: not in app board Added by automation for pull requests with tasks not added to macOS App Board Asana project labels Mar 21, 2024
quanganhdo
quanganhdo approved these changes Mar 22, 2024
View reviewed changes
Copy link
Member

@quanganhdo quanganhdo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM & works great!

@graeme graeme merged commit 5e73f79 into main Mar 22, 2024
24 of 25 checks passed
@graeme graeme deleted the graeme/expiry-button-selection-state branch March 22, 2024 16:20
samsymons added a commit that referenced this pull request Mar 22, 2024
@samsymons
Merge branch 'main' into sam/vpn-ship-review-problems
91ce5c9 
* main:
  BrowserServicesKit bump to 129.1.4 (#2487)
  DBP: Fix memory leak on WebViewHandler (#2483)
  Invalidate user cache (#2486)
  Rework the caching logic for subscription and entitlements (#2485)
  Fix expiry prompt uninstall button selection state (#2475)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@quanganhdo quanganhdo quanganhdo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@graeme @quanganhdo