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

Wire up VPN error UI #2826

Merged
merged 6 commits into from
May 9, 2024
Merged

Wire up VPN error UI #2826

merged 6 commits into from
May 9, 2024

Conversation

samsymons
Copy link
Contributor

Task/Issue URL: https://app.asana.com/0/414235014887631/1207198886354136/f
Tech Design URL:
CC:

Description:

This PR re-enables the VPN error UI. This is done for internal users only.

Steps to test this PR:

  1. Mark yourself as internal
  2. Update NetworkProtectionStatusViewModel line 300 to return a hardcoded error message
  3. Run it and check that the error UI appears and the color looks good

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

IMG_9F54ABF5E556-1


Internal references:

Software Engineering Expectations
Technical Design Template

* main:
  Release 7.118.0-1 (#2812)
  [Release PR] Update VPN metadata reporter (#2808)
  fix address bar weirdness (#2810)
  Fix RMF button styling for "big_two_action" format (#2811)
  Existing experiment disabled, the new Settings experiment activated (#2801)
  Create Asana Subtask on PR requested (#2803)
  Remove ATB from default params (#2430)
  Fix Kingfisher deprecation warnings (#2799)
  VPN server failure detection recovery (#2779)
  Disable the feedback send button when there’s no text (#2800)
* main:
  Enable field validation for Sync payloads (#2807)
  Fix up address bar spoofing tests to match new behaviours. (#2743)
  Release 7.118.0-4 (#2821)
  Settings: onAppear changed to onDisappear (#2817) (#2820)
  Manage Expired Subscription (#2764)
  Replace deprecated tab preview renderer (#2814)
  Release 7.118.0-3 (#2819)
  Update release notes.
  Settings: onAppear changed to onDisappear (#2817)
  Release 7.118.0-2 (#2815)
  Improve VPN underlying error detail (#2813)
  Break the Subscription module’s dependency on BSK (#2804)
@samsymons samsymons requested a review from graeme May 6, 2024 03:53
return nil
}

return ErrorItem(title: "Failed to Connect", message: errorMessage)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hardcoded the copy here for now so that it doesn't get accidentally translated, we'll come back to this once the error UI is complete and has final copy - for now I just want to get the UI itself in place so that we can use it.

* main:
  Upload logs on cancel (#2836)
  Add bookmarks to top hits suggestions on iOS (#2835)
  Fix Maestro reporting for e2e tests (#2713)
  support marketplace kit (#2833)
  Enable attribution flag (#2825)
  Release 7.119.0-0 (#2831)
  Fix subscriptions glitch in Settings (#2828)
  Delegate SecureVault KeyStore Events in All Scenarios  (#2827)
  Clears subscription cache on restore (#2823)
@samsymons samsymons merged commit d0eb8aa into main May 9, 2024
14 checks passed
@samsymons samsymons deleted the sam/wire-up-error-ui branch May 9, 2024 16:23
samsymons added a commit that referenced this pull request May 10, 2024
# By amddg44 (3) and others
# Via GitHub (1) and amddg44 (1)
* main:
  Enable gzip compression for Sync PATCH payloads (#2805)
  sync error notify (#2822)
  Wire up VPN error UI (#2826)
  Mergeback from release/7.119.0
  Release 7.119.0-1 (#2840)
  Add temporary survey to Passwords screen (#2834)
  Upload logs on cancel (#2836)
  Add bookmarks to top hits suggestions on iOS (#2835)
  Fix Maestro reporting for e2e tests (#2713)
  support marketplace kit (#2833)
  Enable attribution flag (#2825)
  Release 7.119.0-0 (#2831)
  Fix subscriptions glitch in Settings (#2828)
  Delegate SecureVault KeyStore Events in All Scenarios  (#2827)
  Clears subscription cache on restore (#2823)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request May 13, 2024
* main: (27 commits)
  Release 7.120.0-0 (#2846)
  Enable gzip compression for Sync PATCH payloads (#2805)
  sync error notify (#2822)
  Wire up VPN error UI (#2826)
  Mergeback from release/7.119.0
  Release 7.119.0-1 (#2840)
  Add temporary survey to Passwords screen (#2834)
  Upload logs on cancel (#2836)
  Add bookmarks to top hits suggestions on iOS (#2835)
  Fix Maestro reporting for e2e tests (#2713)
  support marketplace kit (#2833)
  Enable attribution flag (#2825)
  Release 7.119.0-0 (#2831)
  Fix subscriptions glitch in Settings (#2828)
  Delegate SecureVault KeyStore Events in All Scenarios  (#2827)
  Clears subscription cache on restore (#2823)
  Enable field validation for Sync payloads (#2807)
  Fix up address bar spoofing tests to match new behaviours. (#2743)
  Release 7.118.0-4 (#2821)
  Settings: onAppear changed to onDisappear (#2817) (#2820)
  ...
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