From f76fd96ab56e7e68228163b6950a88a8b2c19ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Wed, 18 Dec 2024 21:45:23 +0100
Subject: [PATCH 1/3] GHA: Improve PR review notifications

---
 .../workflows/pr-review-notifications.yaml    |   6 +-
 .../values-night/design-system-theming.xml    |   2 +
 vpn_item_patch.patch                          | 175 ++++++++++++++++++
 3 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 vpn_item_patch.patch

diff --git a/.github/workflows/pr-review-notifications.yaml b/.github/workflows/pr-review-notifications.yaml
index fc2c2b9d745c..406495034b5b 100644
--- a/.github/workflows/pr-review-notifications.yaml
+++ b/.github/workflows/pr-review-notifications.yaml
@@ -1,4 +1,4 @@
-name: Pull Request Reviewed -> Asana Sync
+name: Pull Request Reviewed -> Sync With Asana
 
 on:
   pull_request_review:
@@ -6,8 +6,8 @@ on:
 
 jobs:
   pr-reviewed:
-    name: Update Asana task -> PR reviewed
-    uses: duckduckgo/native-github-asana-sync/.github/workflows/pr-review-notifications.yml@david/improve-pr-notifications
+    name: Add PR reviewed comment
+    uses: duckduckgo/native-github-asana-sync/.github/workflows/pr-review-notifications.yml@v1.4
     with:
       trigger-phrase: "Task/Issue URL:"
     secrets:
diff --git a/common/common-ui/src/main/res/values-night/design-system-theming.xml b/common/common-ui/src/main/res/values-night/design-system-theming.xml
index 4350821f20d8..a9aaa060591b 100644
--- a/common/common-ui/src/main/res/values-night/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values-night/design-system-theming.xml
@@ -15,6 +15,8 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+
+
     <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Splash">
         <item name="android:statusBarColor">@color/black</item>
         <item name="android:windowLightStatusBar">false</item>
diff --git a/vpn_item_patch.patch b/vpn_item_patch.patch
new file mode 100644
index 000000000000..8018e46bdece
--- /dev/null
+++ b/vpn_item_patch.patch
@@ -0,0 +1,175 @@
+Subject: [PATCH] vpn item patch
+---
+Index: app/build.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/build.gradle b/app/build.gradle
+--- a/app/build.gradle	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
++++ b/app/build.gradle	(date 1734426914237)
+@@ -121,7 +121,6 @@
+     }
+     buildTypes {
+         debug {
+-            applicationIdSuffix ".debug"
+             pseudoLocalesEnabled false
+             manifestPlaceholders = [
+                     appIcon     : "@mipmap/ic_launcher_blue",
+Index: subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt
+--- a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
++++ b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt	(date 1734438689432)
+@@ -36,6 +36,8 @@
+ import com.duckduckgo.feature.toggles.api.Toggle.State
+ import com.duckduckgo.navigation.api.GlobalActivityStarter
+ import com.duckduckgo.subscriptions.api.Product
++import com.duckduckgo.subscriptions.api.Product.NetP
++import com.duckduckgo.subscriptions.api.Product.PIR
+ import com.duckduckgo.subscriptions.api.SubscriptionStatus
+ import com.duckduckgo.subscriptions.api.Subscriptions
+ import com.duckduckgo.subscriptions.impl.SubscriptionsConstants.PRIVACY_PRO_ETLD
+@@ -51,6 +53,7 @@
+ import javax.inject.Inject
+ import kotlinx.coroutines.CoroutineScope
+ import kotlinx.coroutines.flow.Flow
++import kotlinx.coroutines.flow.flowOf
+ import kotlinx.coroutines.launch
+ import kotlinx.coroutines.runBlocking
+ 
+@@ -71,7 +74,8 @@
+     }
+ 
+     override fun getEntitlementStatus(): Flow<List<Product>> {
+-        return subscriptionsManager.entitlements
++        return flowOf(listOf(NetP))
++        // return subscriptionsManager.entitlements
+     }
+ 
+     override suspend fun isEligible(): Boolean {
+Index: subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt
+--- a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
++++ b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt	(date 1734430985633)
+@@ -439,11 +439,12 @@
+     }
+ 
+     override suspend fun subscriptionStatus(): SubscriptionStatus {
+-        return if (isSignedIn()) {
++        return SubscriptionStatus.AUTO_RENEWABLE
++/*        return if (isSignedIn()) {
+             authRepository.getStatus()
+         } else {
+             UNKNOWN
+-        }
++        }*/
+     }
+ 
+     @Deprecated("This method will be removed after migrating to auth v2")
+Index: app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt
+--- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
++++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt	(date 1734426914242)
+@@ -173,7 +173,7 @@
+                     showAutofill = autofillCapabilityChecker.canAccessCredentialManagementScreen(),
+                     showSyncSetting = deviceSyncState.isFeatureEnabled(),
+                     isAutoconsentEnabled = autoconsent.isSettingEnabled(),
+-                    isPrivacyProEnabled = subscriptions.isEligible(),
++                    isPrivacyProEnabled = true,
+                     isDuckPlayerEnabled = duckPlayer.getDuckPlayerState().let { it == ENABLED || it == DISABLED_WIH_HELP_LINK },
+                     isVoiceSearchVisible = voiceSearchAvailability.isVoiceSearchSupported,
+                 ),
+@@ -192,7 +192,7 @@
+                 val currentState = currentViewState()
+                 viewState.value = currentState.copy(
+                     appTrackingProtectionEnabled = isDeviceShieldEnabled,
+-                    isPrivacyProEnabled = subscriptions.isEligible(),
++                    isPrivacyProEnabled = true,
+                 )
+                 delay(1_000)
+             }
+Index: network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt b/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt
+--- a/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
++++ b/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt	(date 1734426914249)
+@@ -21,12 +21,8 @@
+ import com.duckduckgo.di.scopes.AppScope
+ import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
+ import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor
+-import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnRunningState.ENABLED
+-import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnRunningState.ENABLING
+ import com.duckduckgo.networkprotection.api.NetworkProtectionState
+ import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState
+-import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState.CONNECTED
+-import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState.CONNECTING
+ import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState.DISCONNECTED
+ import com.duckduckgo.networkprotection.impl.NetPVpnFeature
+ import com.duckduckgo.networkprotection.impl.cohort.NetpCohortStore
+@@ -37,7 +33,7 @@
+ import javax.inject.Inject
+ import kotlinx.coroutines.CoroutineScope
+ import kotlinx.coroutines.flow.Flow
+-import kotlinx.coroutines.flow.map
++import kotlinx.coroutines.flow.flowOf
+ import kotlinx.coroutines.launch
+ import kotlinx.coroutines.runBlocking
+ import kotlinx.coroutines.withContext
+@@ -99,13 +95,14 @@
+     }
+ 
+     override fun getConnectionStateFlow(): Flow<ConnectionState> {
+-        return vpnStateMonitor.getStateFlow(NetPVpnFeature.NETP_VPN).map {
++        return flowOf(DISCONNECTED)
++/*        return vpnStateMonitor.getStateFlow(NetPVpnFeature.NETP_VPN).map {
+             when (it.state) {
+                 ENABLED -> CONNECTED
+                 ENABLING -> CONNECTING
+                 else -> DISCONNECTED
+             }
+-        }
++        }*/
+     }
+ 
+     override suspend fun getExcludedApps(): List<String> = withContext(dispatcherProvider.io()) {
+Index: app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt
+--- a/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
++++ b/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt	(date 1734430806242)
+@@ -134,7 +134,7 @@
+                     showAutofill = autofillCapabilityChecker.canAccessCredentialManagementScreen(),
+                     showSyncSetting = deviceSyncState.isFeatureEnabled(),
+                     isAutoconsentEnabled = autoconsent.isSettingEnabled(),
+-                    isPrivacyProEnabled = subscriptions.isEligible(),
++                    isPrivacyProEnabled = true,
+                     isDuckPlayerEnabled = duckPlayer.getDuckPlayerState().let { it == ENABLED || it == DISABLED_WIH_HELP_LINK },
+                 ),
+             )
+@@ -153,7 +153,7 @@
+                 viewState.value = currentState.copy(
+                     appTrackingProtectionOnboardingShown = appTrackingProtection.isOnboarded(),
+                     appTrackingProtectionEnabled = isDeviceShieldEnabled,
+-                    isPrivacyProEnabled = subscriptions.isEligible(),
++                    isPrivacyProEnabled = true,
+                 )
+                 delay(1_000)
+             }

From 703c12e406d7223bfb22cfd5a4bc558886efe727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 19 Dec 2024 12:55:13 +0100
Subject: [PATCH 2/3] remove old workflow

---
 .github/workflows/action-pr-approved.yaml |  17 ---
 vpn_item_patch.patch                      | 175 ----------------------
 2 files changed, 192 deletions(-)
 delete mode 100644 .github/workflows/action-pr-approved.yaml
 delete mode 100644 vpn_item_patch.patch

diff --git a/.github/workflows/action-pr-approved.yaml b/.github/workflows/action-pr-approved.yaml
deleted file mode 100644
index d9289e66cad8..000000000000
--- a/.github/workflows/action-pr-approved.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Pull Request Reviewed
-
-on:
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  pr-reviewed:
-    if: github.event.review.state == 'approved'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Update Asana task -> PR approved
-        uses: duckduckgo/native-github-asana-sync@v1.1
-        with:
-          asana-pat: ${{ secrets.GH_ASANA_SECRET }}
-          trigger-phrase: "Task/Issue URL:"
-          action: 'notify-pr-approved'
\ No newline at end of file
diff --git a/vpn_item_patch.patch b/vpn_item_patch.patch
deleted file mode 100644
index 8018e46bdece..000000000000
--- a/vpn_item_patch.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Subject: [PATCH] vpn item patch
----
-Index: app/build.gradle
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/app/build.gradle b/app/build.gradle
---- a/app/build.gradle	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
-+++ b/app/build.gradle	(date 1734426914237)
-@@ -121,7 +121,6 @@
-     }
-     buildTypes {
-         debug {
--            applicationIdSuffix ".debug"
-             pseudoLocalesEnabled false
-             manifestPlaceholders = [
-                     appIcon     : "@mipmap/ic_launcher_blue",
-Index: subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt
---- a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
-+++ b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/RealSubscriptions.kt	(date 1734438689432)
-@@ -36,6 +36,8 @@
- import com.duckduckgo.feature.toggles.api.Toggle.State
- import com.duckduckgo.navigation.api.GlobalActivityStarter
- import com.duckduckgo.subscriptions.api.Product
-+import com.duckduckgo.subscriptions.api.Product.NetP
-+import com.duckduckgo.subscriptions.api.Product.PIR
- import com.duckduckgo.subscriptions.api.SubscriptionStatus
- import com.duckduckgo.subscriptions.api.Subscriptions
- import com.duckduckgo.subscriptions.impl.SubscriptionsConstants.PRIVACY_PRO_ETLD
-@@ -51,6 +53,7 @@
- import javax.inject.Inject
- import kotlinx.coroutines.CoroutineScope
- import kotlinx.coroutines.flow.Flow
-+import kotlinx.coroutines.flow.flowOf
- import kotlinx.coroutines.launch
- import kotlinx.coroutines.runBlocking
- 
-@@ -71,7 +74,8 @@
-     }
- 
-     override fun getEntitlementStatus(): Flow<List<Product>> {
--        return subscriptionsManager.entitlements
-+        return flowOf(listOf(NetP))
-+        // return subscriptionsManager.entitlements
-     }
- 
-     override suspend fun isEligible(): Boolean {
-Index: subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt
---- a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
-+++ b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt	(date 1734430985633)
-@@ -439,11 +439,12 @@
-     }
- 
-     override suspend fun subscriptionStatus(): SubscriptionStatus {
--        return if (isSignedIn()) {
-+        return SubscriptionStatus.AUTO_RENEWABLE
-+/*        return if (isSignedIn()) {
-             authRepository.getStatus()
-         } else {
-             UNKNOWN
--        }
-+        }*/
-     }
- 
-     @Deprecated("This method will be removed after migrating to auth v2")
-Index: app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt
---- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
-+++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt	(date 1734426914242)
-@@ -173,7 +173,7 @@
-                     showAutofill = autofillCapabilityChecker.canAccessCredentialManagementScreen(),
-                     showSyncSetting = deviceSyncState.isFeatureEnabled(),
-                     isAutoconsentEnabled = autoconsent.isSettingEnabled(),
--                    isPrivacyProEnabled = subscriptions.isEligible(),
-+                    isPrivacyProEnabled = true,
-                     isDuckPlayerEnabled = duckPlayer.getDuckPlayerState().let { it == ENABLED || it == DISABLED_WIH_HELP_LINK },
-                     isVoiceSearchVisible = voiceSearchAvailability.isVoiceSearchSupported,
-                 ),
-@@ -192,7 +192,7 @@
-                 val currentState = currentViewState()
-                 viewState.value = currentState.copy(
-                     appTrackingProtectionEnabled = isDeviceShieldEnabled,
--                    isPrivacyProEnabled = subscriptions.isEligible(),
-+                    isPrivacyProEnabled = true,
-                 )
-                 delay(1_000)
-             }
-Index: network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt b/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt
---- a/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
-+++ b/network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/state/NetworkProtectionStateImpl.kt	(date 1734426914249)
-@@ -21,12 +21,8 @@
- import com.duckduckgo.di.scopes.AppScope
- import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
- import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor
--import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnRunningState.ENABLED
--import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnRunningState.ENABLING
- import com.duckduckgo.networkprotection.api.NetworkProtectionState
- import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState
--import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState.CONNECTED
--import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState.CONNECTING
- import com.duckduckgo.networkprotection.api.NetworkProtectionState.ConnectionState.DISCONNECTED
- import com.duckduckgo.networkprotection.impl.NetPVpnFeature
- import com.duckduckgo.networkprotection.impl.cohort.NetpCohortStore
-@@ -37,7 +33,7 @@
- import javax.inject.Inject
- import kotlinx.coroutines.CoroutineScope
- import kotlinx.coroutines.flow.Flow
--import kotlinx.coroutines.flow.map
-+import kotlinx.coroutines.flow.flowOf
- import kotlinx.coroutines.launch
- import kotlinx.coroutines.runBlocking
- import kotlinx.coroutines.withContext
-@@ -99,13 +95,14 @@
-     }
- 
-     override fun getConnectionStateFlow(): Flow<ConnectionState> {
--        return vpnStateMonitor.getStateFlow(NetPVpnFeature.NETP_VPN).map {
-+        return flowOf(DISCONNECTED)
-+/*        return vpnStateMonitor.getStateFlow(NetPVpnFeature.NETP_VPN).map {
-             when (it.state) {
-                 ENABLED -> CONNECTED
-                 ENABLING -> CONNECTING
-                 else -> DISCONNECTED
-             }
--        }
-+        }*/
-     }
- 
-     override suspend fun getExcludedApps(): List<String> = withContext(dispatcherProvider.io()) {
-Index: app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt
---- a/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt	(revision d69001dc7d4e71f978684f04c04ea51c5f6394bb)
-+++ b/app/src/main/java/com/duckduckgo/app/settings/LegacySettingsViewModel.kt	(date 1734430806242)
-@@ -134,7 +134,7 @@
-                     showAutofill = autofillCapabilityChecker.canAccessCredentialManagementScreen(),
-                     showSyncSetting = deviceSyncState.isFeatureEnabled(),
-                     isAutoconsentEnabled = autoconsent.isSettingEnabled(),
--                    isPrivacyProEnabled = subscriptions.isEligible(),
-+                    isPrivacyProEnabled = true,
-                     isDuckPlayerEnabled = duckPlayer.getDuckPlayerState().let { it == ENABLED || it == DISABLED_WIH_HELP_LINK },
-                 ),
-             )
-@@ -153,7 +153,7 @@
-                 viewState.value = currentState.copy(
-                     appTrackingProtectionOnboardingShown = appTrackingProtection.isOnboarded(),
-                     appTrackingProtectionEnabled = isDeviceShieldEnabled,
--                    isPrivacyProEnabled = subscriptions.isEligible(),
-+                    isPrivacyProEnabled = true,
-                 )
-                 delay(1_000)
-             }

From 44287ad968a2265ebb5b91cbf951ac3892cc080b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 19 Dec 2024 12:56:40 +0100
Subject: [PATCH 3/3] revert formatting

---
 .../src/main/res/values-night/design-system-theming.xml         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/common-ui/src/main/res/values-night/design-system-theming.xml b/common/common-ui/src/main/res/values-night/design-system-theming.xml
index a9aaa060591b..4350821f20d8 100644
--- a/common/common-ui/src/main/res/values-night/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values-night/design-system-theming.xml
@@ -15,8 +15,6 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-
-
     <style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Splash">
         <item name="android:statusBarColor">@color/black</item>
         <item name="android:windowLightStatusBar">false</item>