Merge tag '7.147.1' into michal/include-hotfix-changes

duckduckgo · Dec 4, 2024 · 835dcc2 · 835dcc2
2 parents a5dab98 + b55028c
commit 835dcc2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -11313,7 +11313,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 216.0.1;
+				version = "216.0.1-1";
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "59f8fb2f850f8a0482c604d07396e01e8de59d21",
-        "version" : "216.0.1"
+        "revision" : "3517357ecd9d5e9ef7ef2f229c0ebc6460f309e6",
+        "version" : "216.0.1-1"
       }
     },
     {

diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift
@@ -135,7 +135,10 @@ final class AppDependencyProvider: DependencyProvider {
             }
         }
 
-        let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: DefaultStorePurchaseManager(subscriptionFeatureMappingCache: subscriptionFeatureMappingCache),
+        let storePurchaseManager = DefaultStorePurchaseManager(subscriptionFeatureMappingCache: subscriptionFeatureMappingCache,
+                                                               subscriptionFeatureFlagger: subscriptionFeatureFlagger)
+
+        let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: storePurchaseManager,
                                                              accountManager: accountManager,
                                                              subscriptionEndpointService: subscriptionService,
                                                              authEndpointService: authService,

diff --git a/DuckDuckGo/TextZoomEditorModel.swift b/DuckDuckGo/TextZoomEditorModel.swift
@@ -59,11 +59,11 @@ class TextZoomEditorModel: ObservableObject {
         NotificationCenter.default.post(
             name: AppUserDefaults.Notifications.textZoomChange,
             object: nil)
-        DailyPixel.fire(pixel: .textZoomChangedOnPageDaily)
     }
 
     func onDismiss() {
         guard initialValue.rawValue != TextZoomLevel.allCases[value].rawValue else { return }
+        DailyPixel.fire(pixel: .textZoomChangedOnPageDaily)
         Pixel.fire(.textZoomChangedOnPage, withAdditionalParameters: [
             PixelParameters.textZoomInitial: String(initialValue.rawValue),
             PixelParameters.textZoomUpdated: String(TextZoomLevel.allCases[value].rawValue),