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

Wait for UserScripts to be loaded for email protection #3252

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

mallexxx
Copy link
Collaborator

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

Description:

  • Fixes Email Protection not supported when loaded before ContentScopeUserScript

Steps to test this PR:

  1. Activate Settings->General->Reopen all windows from last session
  2. Open …->Email Protection
  3. Quit
  4. rm -rf ~/Library/WebKit/com.duckduckgo.macos.browser.debug/ContentRuleLists
  5. Run; validate Email Protection loads and there‘s no "Unavailable in this browser" message

Definition of Done:


Internal references:

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

Copy link
Collaborator

@ayoy ayoy left a comment

Choose a reason for hiding this comment

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

@mallexxx this works great, thanks for the fix! Because the code change is tiny and straightforward, could we please merge it to the release branch so that it's released next week? Thanks!

@ayoy ayoy removed the request for review from SabrinaTardio September 11, 2024 18:46
@mallexxx mallexxx changed the base branch from main to release/1.106.0 September 12, 2024 04:29
@mallexxx mallexxx merged commit 0da9af2 into release/1.106.0 Sep 12, 2024
20 checks passed
@mallexxx mallexxx deleted the alex/email-protection-fix branch September 12, 2024 04:46
samsymons added a commit that referenced this pull request Sep 12, 2024
# By Dominik Kapusta (4) and others
# Via Dominik Kapusta (4) and GitHub (2)
* main:
  Support dragging strings to new tab button (#3228)
  BSK - Add feature flag for SKAN API (#3265)
  Ignore accents when doing a bookmark search (#3255)
  Update UI tests workflows to always compile the app on the supported version of Xcode (#3262)
  Bump C.S.S (via BSK) (#3244)
  Tab previews presentation implementation adjusted for the latest MouseOverView logic (#3260)
  Bump version to 1.106.0 (260)
  Default to appstore signing for fastlane match
  Clean up secrets in GHA workflows
  Update Onboarding gradients (#3248)
  Wait for UserScripts to be loaded for email protection (#3252)
  Fix UI tests failing in the CI (#3254)
  Fix WKDownloadMock mock (#3258)
  VPN Proxy stop and pixel improvements (#3239)
  Use fastlane match for code signing DMG builds (#3246)
  Implement new VPN site troubleshooting report alert (#3224)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Sep 13, 2024
# By Dominik Kapusta (7) and others
# Via Dominik Kapusta (6) and GitHub (4)
* main: (37 commits)
  Add visted links support (#3261)
  Bump version to 1.106.0 (261)
  Update Gemfile.lock
  Remove migration file (#3270)
  Use new AsanaCreateActionItem action (#3264)
  Update survey builder OS version (#3247)
  Support dragging strings to new tab button (#3228)
  BSK - Add feature flag for SKAN API (#3265)
  Ignore accents when doing a bookmark search (#3255)
  Update UI tests workflows to always compile the app on the supported version of Xcode (#3262)
  Bump C.S.S (via BSK) (#3244)
  Tab previews presentation implementation adjusted for the latest MouseOverView logic (#3260)
  Bump version to 1.106.0 (260)
  Default to appstore signing for fastlane match
  Clean up secrets in GHA workflows
  Update Onboarding gradients (#3248)
  Wait for UserScripts to be loaded for email protection (#3252)
  Fix UI tests failing in the CI (#3254)
  Fix WKDownloadMock mock (#3258)
  VPN Proxy stop and pixel improvements (#3239)
  ...

# 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