Subscriptions: 19. Error handling and minor updates #2567
Merged
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
# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Conflicts: # DuckDuckGo/Subscription/Views/SubscriptionFlowView.swift # submodules/privacy-reference-tests
miasma13
approved these changes
Mar 11, 2024
samsymons
added a commit
that referenced
this pull request
Mar 13, 2024
* main: Subscriptions: 20 - Subscription Caching (#2569) Subscriptions: 19. Error handling and minor updates (#2567) Use History on iOS (#2539) Release 7.112.0-1 (#2573) Report on toggle protections off (#2536) Release 7.112.0-0 (#2572) Update autoconsent to v10.2.0 (#2554) update metadata (#2571) Subscription pro pixels (#2531) Update SwiftSoup and Kingfisher versions (#2566) Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560) Fix VPN view model memory leak (#2570) Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500) 18. Subscription Entitlements caching (#2556) Release 7.111.0-2 (#2563) Revert "Report Apple Ad attribution using pixel (#2510)" (#2562) Vanilla browser integration (#2550) Fix blank space after URL bar hides (#2549) Release 7.111.0-1 (#2561)
samsymons
added a commit
that referenced
this pull request
Mar 13, 2024
…-lottie-animation * sam/vpn-ui-improvements: Subscriptions: 20 - Subscription Caching (#2569) Subscriptions: 19. Error handling and minor updates (#2567) Use History on iOS (#2539) Release 7.112.0-1 (#2573) Report on toggle protections off (#2536) Release 7.112.0-0 (#2572) Update autoconsent to v10.2.0 (#2554) update metadata (#2571) Subscription pro pixels (#2531) Update SwiftSoup and Kingfisher versions (#2566) Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560) Fix VPN view model memory leak (#2570) Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500) 18. Subscription Entitlements caching (#2556) Release 7.111.0-2 (#2563) Revert "Report Apple Ad attribution using pixel (#2510)" (#2562) Vanilla browser integration (#2550) Fix blank space after URL bar hides (#2549) Release 7.111.0-1 (#2561)
samsymons
added a commit
that referenced
this pull request
Mar 13, 2024
…n-ui-improvements-3-combine-notification-settings * sam/vpn-ui-improvements-2-lottie-animation: Subscriptions: 20 - Subscription Caching (#2569) Subscriptions: 19. Error handling and minor updates (#2567) Use History on iOS (#2539) Release 7.112.0-1 (#2573) Report on toggle protections off (#2536) Release 7.112.0-0 (#2572) Update autoconsent to v10.2.0 (#2554) update metadata (#2571) Subscription pro pixels (#2531) Update SwiftSoup and Kingfisher versions (#2566) Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560) Fix VPN view model memory leak (#2570) Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500) 18. Subscription Entitlements caching (#2556) Release 7.111.0-2 (#2563) Revert "Report Apple Ad attribution using pixel (#2510)" (#2562) Vanilla browser integration (#2550) Fix blank space after URL bar hides (#2549) Release 7.111.0-1 (#2561)
samsymons
added a commit
that referenced
this pull request
Mar 13, 2024
…' into sam/vpn-ui-improvements-4-location-setting-change # By Mariusz Śpiewak (3) and others # Via Sam Symons (4) and others * sam/vpn-ui-improvements-3-combine-notification-settings: Subscriptions: 20 - Subscription Caching (#2569) Subscriptions: 19. Error handling and minor updates (#2567) Use History on iOS (#2539) Release 7.112.0-1 (#2573) Report on toggle protections off (#2536) Release 7.112.0-0 (#2572) Update autoconsent to v10.2.0 (#2554) update metadata (#2571) Subscription pro pixels (#2531) Update SwiftSoup and Kingfisher versions (#2566) Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560) Fix VPN view model memory leak (#2570) Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500) 18. Subscription Entitlements caching (#2556) Release 7.111.0-2 (#2563) Revert "Report Apple Ad attribution using pixel (#2510)" (#2562) Vanilla browser integration (#2550) Fix blank space after URL bar hides (#2549) Release 7.111.0-1 (#2561) # 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
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/0/1206362842825244/f
Description:
Steps to test this PR:
Webview Errors:
(These errors have been attached to all Webviews)
Back button: