From a0d9cdc450bd8b2f9d970e3490d5ce4e990b126d Mon Sep 17 00:00:00 2001
From: Christian Sadilek <christian.sadilek@gmail.com>
Date: Thu, 16 Jul 2020 10:51:36 -0400
Subject: [PATCH] For #12248: Webcompat reporter not active in Nightly

---
 app/src/main/java/org/mozilla/fenix/components/Core.kt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 752de367b..d3ec37d3a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -50,7 +50,6 @@ import org.mozilla.fenix.BuildConfig.DIGITAL_ASSET_LINKS_TOKEN
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ReleaseChannel
 import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
@@ -97,11 +96,7 @@ class Core(private val context: Context) {
              * disabled in Fenix Release builds for now.
              * This is consistent with both Fennec and Firefox Desktop.
              */
-            val shouldEnableWebcompatReporter = Config.channel !in setOf(
-                ReleaseChannel.FenixProduction,
-                ReleaseChannel.FennecProduction
-            )
-            if (shouldEnableWebcompatReporter) {
+            if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {
                 WebCompatReporterFeature.install(it)
             }
         }