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.

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

Reenable toggle on disallowing vpn #2404

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Conversation

graeme
Copy link
Contributor

@graeme graeme commented Jan 29, 2024

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

Description:
When “Don’t Allow” is tapped, the dialog is dismissed and the toggle is greyed out. We have to back out of the screen and reopen the VPN screen to give it another attempt.

Reenable the button again when the VPN permission is denied.

This can be solved by simply reenabling the toggle after it’s been disabled for 2 seconds, something we were already sort of doing to stop spamming. This just slightly reworks the logic to cover more scenarios.

Steps to test this PR:

  1. Delete any existing VPN config
  2. Go to the Network Protection screen
  3. Tap the toggle
  4. Tap Don’t Allow
  5. The toggle should be reenabled

Copy Testing:

  • Use of correct apostrophes in new copy, ie rather than

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16

Theme Testing:

  • Light theme
  • Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

@graeme graeme requested a review from samsymons January 29, 2024 19:20
@samsymons samsymons merged commit 590c586 into main Jan 29, 2024
10 checks passed
@samsymons samsymons deleted the graeme/handle-disallowing-vpn branch January 29, 2024 22:19
samsymons added a commit that referenced this pull request Jan 30, 2024
# By dependabot[bot] (1) and others
# Via GitHub
* main:
  Reenable toggle on disallowing vpn (#2404)
  Bump BrowserServicesKit to 103.0.2 (#2393)
  Fix the alpha build VPN extension embed script (#2396)
  Fix `site:` queries escaping with iOS 17 SDK (#640) (#2402)
  Prepare release script updates (#2389)
  Adding lastSentDate to broken site report  (#2320)
  Bump submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2382)
  Skip 'Make Release Build' GHA job for Dependabot PRs (#2399)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons pushed a commit that referenced this pull request Jan 30, 2024
Task/Issue URL: https://app.asana.com/0/0/1206463994034099/f

Description:
When “Don’t Allow” is tapped, the dialog is dismissed and the toggle is greyed out. We have to back out of the screen and reopen the VPN screen to give it another attempt.

Reenable the button again when the VPN permission is denied.

This can be solved by simply reenabling the toggle after it’s been disabled for 2 seconds, something we were already sort of doing to stop spamming. This just slightly reworks the logic to cover more scenarios.
samsymons added a commit that referenced this pull request Jan 30, 2024
Task/Issue URL: https://app.asana.com/0/0/1206463994034099/f

Description:

When “Don’t Allow” is tapped, the dialog is dismissed and the toggle is greyed out. We have to back out of the screen and reopen the VPN screen to give it another attempt.

Reenable the button again when the VPN permission is denied.

This can be solved by simply reenabling the toggle after it’s been disabled for 2 seconds, something we were already sort of doing to stop spamming. This just slightly reworks the logic to cover more scenarios.
samsymons added a commit that referenced this pull request Feb 4, 2024
* main: (41 commits)
  Update BSK with autofill 10.1.0 (#2414)
  Bump submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2408)
  Add Autoconsent onByDefault subfeature (#2423)
  Metadata reverted https://app.asana.com/0/0/1206476969305202/1206481077004998/f
  metadata updated
  Release 7.107.0-0 (#2421)
  More script fixes (#2419)
  More release script fixes (#2418)
  Release/7.106.0-4 (#2417)
  Reenable toggle on disallowing vpn (#2404) (#2416)
  Don't crash when AppRatingPromptEntity fetch errors (#2388)
  Add error codes to site breakage reports (#2413)
  Don't set dryRun for alpha builds (#2412)
  Add VPN redemption retry event (#2409)
  Changes to hotfix process (#2406)
  Release/7.106.0-3 changes (#2411)
  Fix tab loading (#2410)
  Improve waitlist invite code checks (#2398)
  Reenable toggle on disallowing vpn (#2404)
  Bump BrowserServicesKit to 103.0.2 (#2393)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants