Merge remote-tracking branch 'origin/main' into graeme/partial-form-save

duckduckgo · Dec 9, 2024 · d35234a · d35234a
2 parents 738f988 + f565fd5
commit d35234a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -11363,8 +11363,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 210.0.1;
+				kind = revision;
+				revision = 6a5642a07acc85af9e1b165066e5b9d9716b7a09;
 			};
 		};
 		98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {

diff --git a/DuckDuckGo/OnboardingExperiment/ContextualDaxDialogs/ContextualOnboardingDialogs.swift b/DuckDuckGo/OnboardingExperiment/ContextualDaxDialogs/ContextualOnboardingDialogs.swift
@@ -34,6 +34,7 @@ struct OnboardingTrySearchDialog: View {
                     title: title,
                     titleFont: Font(UIFont.daxTitle3()),
                     message: NSAttributedString(string: message),
+                    messageFont: Font.system(size: 16),
                     list: viewModel.itemsList,
                     listAction: viewModel.listItemPressed
                 )
@@ -67,6 +68,7 @@ struct OnboardingTryVisitingSiteDialogContent: View {
             title: viewModel.title,
             titleFont: Font(UIFont.daxTitle3()),
             message: message,
+            messageFont: Font.system(size: 16),
             list: viewModel.itemsList,
             listAction: viewModel.listItemPressed)
     }
@@ -90,7 +92,9 @@ struct OnboardingFireButtonDialogContent: View {
 
     var body: some View {
         ContextualDaxDialogContent(
-            message: attributedMessage)
+            message: attributedMessage,
+            messageFont: Font.system(size: 16)
+        )
     }
 }
 
@@ -113,6 +117,7 @@ struct OnboardingFirstSearchDoneDialog: View {
                     } else {
                         ContextualDaxDialogContent(
                             message: message,
+                            messageFont: Font.system(size: 16),
                             customActionView: AnyView(
                                 OnboardingCTAButton(title: cta) {
                                     gotItAction()
@@ -164,6 +169,7 @@ struct OnboardingTrackersDoneDialog: View {
                     } else {
                         ContextualDaxDialogContent(
                             message: message,
+                            messageFont: Font.system(size: 16),
                             customActionView: AnyView(
                                 OnboardingCTAButton(title: cta) {
                                     blockedTrackersCTAAction()

diff --git a/DuckDuckGo/OnboardingExperiment/ContextualDaxDialogs/NewTabDaxDialogFactory.swift b/DuckDuckGo/OnboardingExperiment/ContextualDaxDialogs/NewTabDaxDialogFactory.swift
@@ -89,7 +89,7 @@ final class NewTabDaxDialogFactory: NewTabDaxDialogProvider {
         FadeInView {
             ScrollView(.vertical) {
                 DaxDialogView(logoPosition: .top) {
-                    ContextualDaxDialogContent(message: NSAttributedString(string: message))
+                    ContextualDaxDialogContent(message: NSAttributedString(string: message), messageFont: Font.system(size: 16))
                 }
                 .padding()
             }