Merge branch 'main' into sam/vpn-ui-improvements-bsk-bump

# 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

.github/workflows/publish_dmg_release.yml

@@ -110,12 +110,24 @@ jobs:
           fi
           echo "release-version=${TAG//-/.}" >> $GITHUB_OUTPUT
 
+      # Always check out main first, because the release branch might have been deleted (for public releases)
       - name: Check out the code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log
           submodules: recursive
-          ref: ${{ inputs.branch || github.ref_name }}
+          ref: main
+
+      - name: Check out the branch if it exists
+        env:
+          branch: ${{ inputs.branch || github.ref_name }}
+        run: |
+          if [[ -z "${branch}" ]] || git ls-remote --exit-code --heads origin "${branch}"; then
+            echo "::notice::Checking out ${branch} branch."
+            git checkout "${branch}"
+          else
+            echo "::notice::Branch ${branch} doesn't exist on the remote repository, staying on main."
+          fi
 
       - name: Select Xcode
         run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer

Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig

@@ -49,10 +49,10 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS NetP VPN App - Review (XPC)
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS NetP VPN App - Release (XPC)
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
 
 SWIFT_OBJC_BRIDGING_HEADER =
 SKIP_INSTALL = YES

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 145
+CURRENT_PROJECT_VERSION = 146

Configuration/Common.xcconfig

@@ -21,7 +21,7 @@ COMBINE_HIDPI_IMAGES = YES
 DEVELOPMENT_TEAM = HKE973VLUW
 DEVELOPMENT_TEAM[config=CI][sdk=*] =
 
-FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION
+FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION SUBSCRIPTION
 
 GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DEBUG=1 CI=1 $(inherited)
 GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = DEBUG=1 $(inherited)

Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig

@@ -31,10 +31,10 @@ INFOPLIST_FILE = NetworkProtectionSystemExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
 INFOPLIST_KEY_NSSystemExtensionUsageDescription = DuckDuckGo VPN
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION SUBSCRIPTION
 
 PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(SYSEX_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(SYSEX_BUNDLE_ID)

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -165,7 +165,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme

@@ -106,6 +106,9 @@
                <Test
                   Identifier = "PixelStoreTests/testWhenValuesAreAddedThenCallbacksAreCalled()">
                </Test>
+               <Test
+                  Identifier = "PreferencesSidebarModelTests/testWhenResetTabSelectionIfNeededCalledThenPreferencesTabIsSelected()">
+               </Test>
                <Test
                   Identifier = "StatisticsLoaderTests/testWhenRefreshRetentionAtbIsPerformedForNavigationThenAppRetentionAtbRequested()">
                </Test>

DuckDuckGo/Application/AppDelegate.swift

@@ -81,8 +81,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
     let bookmarksManager = LocalBookmarkManager.shared
     var privacyDashboardWindow: NSWindow?
 
+#if SUBSCRIPTION
+    let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
+#endif
+
 #if NETWORK_PROTECTION && SUBSCRIPTION
-    private let networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler()
+    // Needs to be lazy as indirectly depends on AppDelegate
+    private lazy var networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler()
 #endif
 
 #if DBP && SUBSCRIPTION
@@ -182,6 +187,15 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
         featureFlagger = DefaultFeatureFlagger(internalUserDecider: internalUserDecider,
                                                privacyConfig: AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager.privacyConfig)
 
+#if SUBSCRIPTION
+    #if APPSTORE || !STRIPE
+        SubscriptionPurchaseEnvironment.current = .appStore
+    #else
+        SubscriptionPurchaseEnvironment.current = .stripe
+    #endif
+        subscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability(privacyConfigurationManager: AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
+                                                                                 purchasePlatform: SubscriptionPurchaseEnvironment.current)
+#endif
     }
 
     func applicationWillFinishLaunching(_ notification: Notification) {
@@ -246,12 +260,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
                                                      defaultValue: defaultEnvironment).wrappedValue
         SubscriptionPurchaseEnvironment.currentServiceEnvironment = currentEnvironment
 
-    #if APPSTORE || !STRIPE
-        SubscriptionPurchaseEnvironment.current = .appStore
-    #else
-        SubscriptionPurchaseEnvironment.current = .stripe
-    #endif
-
         Task {
             let accountManager = AccountManager()
             do {

DuckDuckGo/Application/URLEventHandler.swift

@@ -143,8 +143,12 @@ final class URLEventHandler {
         case AppLaunchCommand.showVPNLocations.launchURL:
             WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .vpn)
             WindowControllersManager.shared.showLocationPickerSheet()
-        case AppLaunchCommand.moveAppToApplications.launchURL:
+#if SUBSCRIPTION
+        case AppLaunchCommand.showPrivacyPro.launchURL:
+            WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+#endif
 #if !APPSTORE && !DEBUG
+        case AppLaunchCommand.moveAppToApplications.launchURL:
             // this should be run after NSApplication.shared is set
             PFMoveToApplicationsFolderIfNecessary(false)
 #endif

DuckDuckGo/Assets.xcassets/Colors/AlertGreen.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0xC0",
+          "red" : "0x21"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/HomePage/Rocket.imageset/Contents.json → DuckDuckGo/Assets.xcassets/Images/Accessibility.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "rocket.pdf",
+      "filename" : "Icon 18.pdf",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/Images/AddBookmark.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon-16-bookmark-add.pdf",
+      "filename" : "AddBookmark.svg",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/Images/AddFolder.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon-16-folder-add.pdf",
+      "filename" : "AddFolder.svg",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/Images/BookmarksFolder.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "BookmarksFolder.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Chevron-Medium-Right-16.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Chevron-Medium-Right-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/CookieProtectionIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 13.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/EmailProtectionIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 12.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/FireSettings.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 17.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/GeneralIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/HomePage/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Gift-96.imageset/Contents.json

@@ -1,12 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "Gift-96.pdf",
+      "filename" : "Gift-New-96x96.pdf",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

DuckDuckGo/Assets.xcassets/Images/Privacy.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Privacy (Color).pdf",
+      "filename" : "Privacy.pdf",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/Images/PrivateSearchIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 10.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Chevron-Next-16.imageset/Contents.json → DuckDuckGo/Assets.xcassets/Images/Trash.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Chevron-Next-16.pdf",
+      "filename" : "Trash.svg",
       "idiom" : "universal"
     }
   ],

DuckDuckGo/Assets.xcassets/Images/WebTrackingProtectionIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon 11.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}