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

Delay loading Identity Theft Restoration until Content Blocking rules are loaded in the tab #3377

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

ayoy
Copy link
Collaborator

@ayoy ayoy commented Oct 9, 2024

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

Steps to test this PR:

  1. Run the app from Xcode (or grab a review build from here).
  2. Subscribe to Privacy Pro.
  3. Go to Main Menu -> Debug -> Tab -> Append Tabs -> 50 Tabs
  4. While tabs are loading, go to meatball menu -> Privacy Pro -> Identity Theft Restoration.
  5. Verify that ITR landing page loads, and you're not redirected to SERP.

Definition of Done:


Internal references:

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

Comment on lines +106 to +108
|| navigationAction.url.absoluteString.hasPrefix(SubscriptionURL.baseURL.subscriptionURL(environment: .production).absoluteString)
// ContentScopeUserScript needs to be loaded for https://duckduckgo.com/identity-theft-restoration
|| navigationAction.url.absoluteString.hasPrefix(SubscriptionURL.identityTheftRestoration.subscriptionURL(environment: .production).absoluteString) {
Copy link
Collaborator Author

@ayoy ayoy Oct 9, 2024

Choose a reason for hiding this comment

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

The pre-existing rule here would cover https://duckduckgo.com/subscriptions/* URLs.

Identity Theft Restoration, however, doesn't fall under this prefix, as it's under https://duckduckgo.com/identity-theft-restoration. Hence, adding an extra check here.

Copy link
Contributor

@diegoreymendez diegoreymendez left a comment

Choose a reason for hiding this comment

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

Works as described.

@ayoy ayoy merged commit f0de190 into release/1.109.0 Oct 9, 2024
33 of 34 checks passed
@ayoy ayoy deleted the dominik/fix-itr-loading branch October 9, 2024 15:04
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