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

Subscriptions: 19. Error handling and minor updates #2567

Merged
merged 21 commits into from
Mar 11, 2024
Merged

Subscriptions: 19. Error handling and minor updates #2567

merged 21 commits into from
Mar 11, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Mar 9, 2024 •
edited
Loading

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

Description:

  • Adds additional error handling cases for subscriptions
  • Updates accessToken in PIR
  • Reorganized a few things in Settings (For readability)

Steps to test this PR:

Webview Errors:
(These errors have been attached to all Webviews)

  1. Sign out of the active subscription (if any)
  2. Go to Settings
  3. Tap "I have a subscription"
  4. Disable Wifi
  5. Tap "Restore Purchase"
  6. The "Something Went Wrong" alert should appear
  7. Tap "Back to Settings"
  8. Confirm the modal is closed and you're back in settings UI

Back button:

  1. Sign out of the active subscription (if any)
  2. Go to Settings
  3. Tap "Learn More"
  4. Back button should not be visible on the top left corner

afterxleep added 14 commits March 7, 2024 18:00
@afterxleep afterxleep requested a review from miasma13 March 9, 2024 20:57
@afterxleep afterxleep merged commit bbacdd7 into main Mar 11, 2024
13 checks passed
@afterxleep afterxleep deleted the daniel/subscriptions/19.subscription.errors branch March 11, 2024 22:42
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'main' into sam/vpn-ui-improvements
9f5800b 
* 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
@samsymons
Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…
b73a8c9 
…-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
@samsymons
Merge branch 'sam/vpn-ui-improvements-2-lottie-animation' into sam/vp…
dce136f 
…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
@samsymons
Merge branch 'sam/vpn-ui-improvements-3-combine-notification-settings…
934502c 
…' 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
Reviewers

@miasma13 miasma13 miasma13 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
@afterxleep @miasma13