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

iOS UI improvements #2412

Merged
merged 8 commits into from
Mar 20, 2024
Merged

iOS UI improvements #2412

merged 8 commits into from
Mar 20, 2024

Conversation

samsymons
Copy link
Collaborator

Task/Issue URL: https://app.asana.com/0/1199230911884351/1206836179343895/f
Tech Design URL:
CC:

Description:

This PR updates BSK to the iOS UI improvements branch.

Steps to test this PR:

  1. Make sure NetP works
  2. Specifically, check that the server location is the same as production

Internal references:

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

@samsymons samsymons requested a review from graeme March 14, 2024 03:44
# By Dax the Duck (5) and others
# Via GitHub (2) and Chris Brind (1)
* main: (30 commits)
  Update wireguard-apple to 1.1.3 (#2428)
  Improves VPN pixel info and adds tests (#2434)
  DBP: Implement event pixels (#2408)
  Bump BSK (#2435)
  Bump version to 1.80.0 (145)
  Fix syntax in Asana actions
  Bump version to 1.80.0 (144)
  Set marketing version to 1.80.0
  Update embedded files
  DBP: Debug scan model implementation (#2421)
  Roll back CPM post-rollout cleanup (#2430)
  Password Import: Ignore Excluded Sites When Importing from Chrome (#2404)
  Stub objects for Bookmarks DB (#2418)
  Properly handle edge cases (#2417)
  DBP: Treat 404 as failure instead of error (#2426)
  DBP: Use url instead of name to identify brokers on pixels (#2423)
  Fix determining if internal release should be automatically bumped
  Renamed some pixel parameters to be more clear (#2402)
  Update broker json (#2407)
  bump bsk to fix retain cycle (#2425)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@samsymons
Copy link
Collaborator Author

Looks like unit tests are failing for legitimate reasons, I'll get that fixed up on Monday.

# By Michal Smaga (2) and others
# Via GitHub (2) and Dominik Kapusta (1)
* main:
  Connect thank you message to DBP method (#2456)
  Use SubscriptionFeatureAvailability to determine availability of the subscription (#2436)
  Add Privacy Pro to App Store build (#2440)
  Display error messaging for cancelled subscriptions (#2394)
  Updated Settings Page (#2329)
  Add VPN & PIR thank you modal (#2437)
  Web pixels (handlers + pixels) (#2451)
  Subscription design review further fixes (#2448)
  Address bookmarks feedback (#2411)
  Handle subscription-related iOS use cases (#2427)
  Remove hardcoded NetP staging endpoint (#2446)
  DBP: Make webview non-persistent and delete any old cache data (#2445)
  Prevents the tunnel from starting without an auth token (#2438)
  Use History in Suggestions on iOS (#2339)
  When publishing a DMG, only check out the branch if it exists, otherwise stay on main
  Bump version to 1.80.0 (146)
  Update autoconsent to v10.3.0 (#2433)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
* main:
  Updates VPN 128 assets (#2459)
  Fix sparkle strings for thank you message (#2461)
  Wire VPN environment to subs menu item  (#2460)
  Makes a method thread safe (#2452)
  Ensure smooth subs updates (#2424)
  Update Pointfree snapshot testing library to 1.15.4 (#2449)
samsymons added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Mar 20, 2024
Required:

Task/Issue URL: https://app.asana.com/0/0/1206827305053615/f
iOS PR: duckduckgo/iOS#2583
macOS PR: duckduckgo/macos-browser#2412
What kind of version bump will this require?: Major

Description:

This PR adds a new message type to the VPN which allows callers to get the throughput from WireGuard.
@samsymons samsymons merged commit 72e4e51 into main Mar 20, 2024
17 checks passed
@samsymons samsymons deleted the sam/vpn-ui-improvements-bsk-bump branch March 20, 2024 17:55
samsymons added a commit that referenced this pull request Mar 20, 2024
* main:
  iOS UI improvements (#2412)
  Updates VPN 128 assets (#2459)
samsymons added a commit that referenced this pull request Mar 21, 2024
# By Diego Rey Mendez (4) and others
# Via GitHub (2) and Dominik Kapusta (1)
* main: (28 commits)
  Entitlements cache fixes (#2465)
  BSK update for RMF app build version improvement (#2362)
  Surface the last-used password first in autofill prompt when filling passwords (#2431)
  Reset subs VPN state from debug menu  (#2462)
  iOS UI improvements (#2412)
  Updates VPN 128 assets (#2459)
  Fix sparkle strings for thank you message (#2461)
  Wire VPN environment to subs menu item  (#2460)
  Makes a method thread safe (#2452)
  Ensure smooth subs updates (#2424)
  Update Pointfree snapshot testing library to 1.15.4 (#2449)
  Connect thank you message to DBP method (#2456)
  Use SubscriptionFeatureAvailability to determine availability of the subscription (#2436)
  Add Privacy Pro to App Store build (#2440)
  Display error messaging for cancelled subscriptions (#2394)
  Updated Settings Page (#2329)
  Add VPN & PIR thank you modal (#2437)
  Web pixels (handlers + pixels) (#2451)
  Subscription design review further fixes (#2448)
  Address bookmarks feedback (#2411)
  ...

# 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants