From b22a34db2e7b33a43c848938af35fc23546fb24a Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 5 May 2022 08:39:39 -0400
Subject: [PATCH] For #25110: Enable the messaging framework feature

---
 .../main/java/org/mozilla/fenix/FeatureFlags.kt |  2 +-
 .../fenix/gleanplumb/MessagingFeatureTest.kt    | 10 ----------
 nimbus.fml.yaml                                 | 17 ++++++++---------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 7013642297..b0bb982c9c 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -95,5 +95,5 @@ object FeatureFlags {
     /**
      * Enables receiving from the messaging framework.
      */
-    val messagingFeature = Config.channel.isNightlyOrDebug
+    const val messagingFeature = true
 }
diff --git a/app/src/test/java/org/mozilla/fenix/gleanplumb/MessagingFeatureTest.kt b/app/src/test/java/org/mozilla/fenix/gleanplumb/MessagingFeatureTest.kt
index 7de27383c9..558ea209d8 100644
--- a/app/src/test/java/org/mozilla/fenix/gleanplumb/MessagingFeatureTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/gleanplumb/MessagingFeatureTest.kt
@@ -4,17 +4,12 @@
 
 package org.mozilla.fenix.gleanplumb
 
-import io.mockk.every
-import io.mockk.mockkObject
 import io.mockk.spyk
-import io.mockk.unmockkObject
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.components.support.test.rule.MainCoroutineRule
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.Config
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.components.AppStore
 import org.mozilla.fenix.components.appstate.AppAction.MessagingAction
 
@@ -28,13 +23,8 @@ class MessagingFeatureTest {
         val store: AppStore = spyk(AppStore())
         val binding = MessagingFeature(store)
 
-        mockkObject(FeatureFlags)
-        every { FeatureFlags.messagingFeature } returns true
-
         binding.start()
 
         verify { store.dispatch(MessagingAction.Evaluate) }
-
-        unmockkObject(Config)
     }
 }
diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml
index 813dd19363..af300128a7 100644
--- a/nimbus.fml.yaml
+++ b/nimbus.fml.yaml
@@ -160,6 +160,13 @@ features:
             URGENT:
               priority: 100
               max-display-count: 10
+          messages:
+            default-browser:
+              text: default_browser_experiment_card_text
+              action: "MAKE_DEFAULT_BROWSER"
+              trigger: [ "I_AM_NOT_DEFAULT_BROWSER" ]
+              style: "DEFAULT"
+              button-label: preferences_set_as_default_browser
 
       - channel: developer
         value:
@@ -170,15 +177,7 @@ features:
             EXPIRES_QUICKLY:
               priority: 100
               max-display-count: 1
-      - channel: nightly
-        value:
-          messages:
-            default-browser:
-              text: default_browser_experiment_card_text
-              action: "MAKE_DEFAULT_BROWSER"
-              trigger: [ "I_AM_NOT_DEFAULT_BROWSER" ]
-              style: "DEFAULT"
-              button-label: preferences_set_as_default_browser
+
   unified-search:
     description: A feature allowing user to easily search for specified results directly in the search bar.
     variables: