From 2c10d49b30d420a14f3a1f7e207796018b0b87ad Mon Sep 17 00:00:00 2001
From: rahulsainani <rsainani@mozilla.com>
Date: Wed, 5 Apr 2023 08:27:17 +0200
Subject: [PATCH] Bug 1826387 - Enable juno onboarding nimbus flag in nightly

---
 app/nimbus.fml.yaml                                   | 7 +++++++
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt   | 5 -----
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 9 +++------
 app/src/main/res/values/preference_keys.xml           | 1 -
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index 6ab594fb1..198758875 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -311,6 +311,13 @@ features:
         description: if true, juno onboarding is shown to the user.
         type: Boolean
         default: false
+    defaults:
+      - channel: nightly
+        value:
+          enabled: true
+      - channel: developer
+        value:
+          enabled: true
 
   onboarding:
     description: "A feature that configures the new user onboarding page.
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 2019c8d38..dc415c0f6 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -71,9 +71,4 @@ object FeatureFlags {
      * Enables the notification pre permission prompt.
      */
     const val notificationPrePermissionPromptEnabled = true
-
-    /**
-     * Enables the redesigned onboarding.
-     */
-    const val junoOnboardingEnabled = false
 }
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index fcef39f48..81576ab3b 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -670,7 +670,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     /**
      * Indicates if the re-engagement notification feature is enabled
      */
-    public val reEngagementNotificationType: Int
+    val reEngagementNotificationType: Int
         get() =
             FxNimbus.features.reEngagementNotification.value().type
 
@@ -1592,11 +1592,8 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     /**
      * Indicates if juno onboarding feature is enabled.
      */
-    var junoOnboardingEnabled by lazyFeatureFlagPreference(
-        key = appContext.getPreferenceKey(R.string.pref_key_juno_onboarding_enabled),
-        default = { FxNimbus.features.junoOnboarding.value().enabled },
-        featureFlag = FeatureFlags.junoOnboardingEnabled,
-    )
+    val junoOnboardingEnabled: Boolean
+        get() = FxNimbus.features.junoOnboarding.value().enabled
 
     /**
      * Indicates if the juno onboarding has been shown to the user.
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index a9acda49e..5f36c4329 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -344,6 +344,5 @@
     <string name="pref_key_is_notification_pre_permission_prompt_shown">pref_key_is_notification_pre_permission_prompt_shown</string>
 
     <!-- Juno Onboarding -->
-    <string name="pref_key_juno_onboarding_enabled">pref_key_juno_onboarding_enabled</string>
     <string name="pref_key_is_juno_onboarding_shown">pref_key_is_juno_onboarding_shown</string>
 </resources>