Hide other surveys when the Privacy Pro survey is visible.

duckduckgo · May 23, 2024 · c47e4ab · c47e4ab
1 parent f7564af
commit c47e4ab
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/DuckDuckGo/Assets.xcassets/Images/PrivacyProSurvey.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/PrivacyProSurvey.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Privacy-Pro-128.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/PrivacyProSurvey.imageset/Privacy-Pro-128.pdf b/DuckDuckGo/Assets.xcassets/Images/PrivacyProSurvey.imageset/Privacy-Pro-128.pdf
diff --git a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
@@ -337,7 +337,8 @@ extension HomePage.Models {
 
         private var shouldPermanentSurveyBeVisible: Bool {
             return shouldShowPermanentSurvey &&
-            permanentSurveyManager.isSurveyAvailable
+            permanentSurveyManager.isSurveyAvailable &&
+            surveyRemoteMessaging.presentableRemoteMessages().isEmpty // When Privacy Pro survey is visible, ensure we do not show multiple at once
         }
 
         @MainActor private func visitSurvey() {
@@ -484,7 +485,7 @@ extension HomePage.Models {
             case .permanentSurvey:
                 return .survey128.resized(to: iconSize)!
             case .surveyRemoteMessage:
-                return .survey128.resized(to: iconSize)!
+                return .privacyProSurvey.resized(to: iconSize)!
             case .dataBrokerProtectionWaitlistInvited:
                 return .dbpInformationRemover.resized(to: iconSize)!
             }

diff --git a/UnitTests/HomePage/Resources/survey-messages.json b/UnitTests/HomePage/Resources/survey-messages.json
@@ -4,7 +4,7 @@
         "cardTitle": "Title 1",
         "cardDescription": "Description 1",
         "attributes": {
-            "subscriptionStatus": "",
+            "subscriptionStatus": "Auto-Renewable",
             "minimumDaysSinceSubscriptionStarted": 1,
             "maximumDaysUntilSubscriptionExpirationOrRenewal": 30,
             "daysSinceVPNEnabled": 2,