duckduckgo · brindy · Jan 16, 2024 · Jan 16, 2024 · Jan 16, 2024 · Jan 16, 2024
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   end-to-end-tests:
     name: End to end Tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
 
     steps:
     - name: Check out the code
@@ -40,34 +40,38 @@ jobs:
       run: |
         set -o pipefail && xcodebuild \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
+          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          ONLY_ACTIVE_ARCH=NO \
         | tee xcodebuild.log
 
     - name: Release tests
-      uses: mobile-dev-inc/action-maestro-cloud@v1.4.1
+      uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
         workspace: .maestro
         include-tags: release
+        ios-version: 17
 
     - name: Privacy tests
-      uses: mobile-dev-inc/action-maestro-cloud@v1.4.1
+      uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
         workspace: .maestro
         include-tags: privacy
+        ios-version: 17
 
     - name: Ad Click Detection Flow tests
-      uses: mobile-dev-inc/action-maestro-cloud@v1.4.1
+      uses: mobile-dev-inc/action-maestro-cloud@v1.8.0
       with:
         api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
         app-file: DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app
         workspace: .maestro
         include-tags: adClick
+        ios-version: 17
 
     - name: Create Asana task when workflow failed
       if: ${{ failure() }}

diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build-for-sync-end-to-end-tests:
     name: Build for Sync End To End Tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 30
 
     steps:
@@ -41,9 +41,10 @@ jobs:
       run: |
         set -o pipefail && xcodebuild \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 14" \
+          -destination "platform=iOS Simulator,name=iPhone 15" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
+          ONLY_ACTIVE_ARCH=NO \
         | tee xcodebuild.log
 
     - name: Store Binary
@@ -65,7 +66,7 @@ jobs:
   sync-end-to-end-tests:
     name: Sync End To End Tests
     needs: build-for-sync-end-to-end-tests
-    runs-on: macos-13
+    runs-on: macos-13-xlarge
     timeout-minutes: 60
     strategy:
       matrix:

diff --git a/.maestro/release_tests/bookmarks.yaml b/.maestro/release_tests/bookmarks.yaml
@@ -47,8 +47,8 @@ tags:
 # Delete bookmark
 - assertVisible: "Edit"
 - tapOn: "Edit"
-- assertVisible: "Delete Privacy Test Pages - Home"
-- tapOn: "Delete Privacy Test Pages - Home"
+- assertVisible: "Remove Privacy Test Pages - Home"
+- tapOn: "Remove Privacy Test Pages - Home"
 - assertVisible: 
     text: "Delete"
     index: 0

diff --git a/.maestro/release_tests/favorites.yaml b/.maestro/release_tests/favorites.yaml
@@ -72,8 +72,8 @@ tags:
 - assertVisible: "Bookmarks"
 - tapOn: "Bookmarks"
 - assertVisible: "Privacy Test Pages - Home"
-- assertVisible: "Delete Privacy Test Pages - Home"
-- tapOn: "Delete Privacy Test Pages - Home"
+- assertVisible: "Remove Privacy Test Pages - Home"
+- tapOn: "Remove Privacy Test Pages - Home"
 - assertVisible: 
     text: "Delete"
     index: 0

diff --git a/.maestro/shared/copy_recovery_code_from_settings.yaml b/.maestro/shared/copy_recovery_code_from_settings.yaml
@@ -6,8 +6,8 @@ appId: com.duckduckgo.mobile.ios
 - scroll
 - scroll
 - scroll
-- assertVisible: Debug Menu
-- tapOn: Debug Menu
+- assertVisible: All debug options
+- tapOn: All debug options
 - tapOn: Sync Info
 - tapOn: Paste and Copy Recovery Code
 - inputText: ${CODE}

diff --git a/.maestro/shared/set_internal_user_from_settings.yaml b/.maestro/shared/set_internal_user_from_settings.yaml
@@ -4,7 +4,9 @@ appId: com.duckduckgo.mobile.ios
 - scroll
 - scroll
 - scroll
-- assertVisible: Debug Menu
-- tapOn: Debug Menu
+- assertVisible: All debug options
+- tapOn: All debug options
 - tapOn: Internal User State
+- tapOn: Settings
+- tapOn: Done
 - tapOn: Settings
diff --git a/.maestro/shared/sync_create.yaml b/.maestro/shared/sync_create.yaml
@@ -1,12 +1,11 @@
 appId: com.duckduckgo.mobile.ios
 ---
 
-- assertVisible: Sync & Backup
 - tapOn: Sync & Backup
 - assertVisible: Sync & Backup 
 - tapOn: Sync and Back Up This Device
 - assertVisible: You can sync with your other devices later.
-- tapOn: Turn on Sync & Backup
+- tapOn: Turn On Sync & Back Up
 - assertVisible: Save Recovery Code
 - tapOn: Copy Code
 - tapOn: Next

diff --git a/.maestro/shared/sync_verify_unified_favorites.yaml b/.maestro/shared/sync_verify_unified_favorites.yaml
@@ -3,7 +3,7 @@ appId: com.duckduckgo.mobile.ios
 
 - tapOn: Sync & Backup
 - scroll
-- assertVisible: Unify Favorites
+- assertVisible: Unify Favorites Across Devices
 - tapOn:
      rightOf: 
       id: "UnifiedFavoritesToggle"

diff --git a/.maestro/sync_tests/04_sync_data.yaml b/.maestro/sync_tests/04_sync_data.yaml
@@ -23,6 +23,12 @@ tags:
 - tapOn: Close Tabs and Clear Data
 
 # Add local login
+- runFlow:
+    when:
+      visible:
+        text: "Cancel"
+    commands:
+      - tapOn: Cancel
 - tapOn: Settings
 - runFlow:
     file: ../shared/add_login_from_settings.yaml

diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -34,13 +34,13 @@ public enum FeatureFlag: String {
     case networkProtection
     case networkProtectionWaitlistAccess
     case networkProtectionWaitlistActive
-    case privacyPro
+    case subscription
 }
 
 extension FeatureFlag: FeatureFlagSourceProviding {
     public var source: FeatureFlagSource {
         switch self {
-        case .debugMenu, .appTrackingProtection, .privacyPro:
+        case .debugMenu, .appTrackingProtection, .subscription:
             return .internalOnly
         case .sync:
             return .remoteReleasable(.subfeature(SyncSubfeature.level0ShowSync))

diff --git a/Core/UserDefaultsPropertyWrapper.swift b/Core/UserDefaultsPropertyWrapper.swift
@@ -122,7 +122,7 @@ public struct UserDefaultsWrapper<T> {
 
         case privacyConfigCustomURL = "com.duckduckgo.ios.privacyConfigCustomURL"
 
-        case privacyProHasActiveSubscription = "com.duckduckgo.ios.privacyPro.hasActiveSubscription"
+        case subscriptionIsActive = "com.duckduckgo.ios.subscruption.isActive"
     }
 
     private let key: Key