Merge pull request #19735 from wordpress-mobile/task/disable-prevent-…

…notifications [Jetpack Focus] Revert Jetpack Notifications Disabling Feature Flag and Release Notes
wordpress-mobile · Dec 6, 2022 · fa14718 · fa14718
2 parents 27964b2 + 75c637f
commit fa14718
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -4,7 +4,6 @@
 
 21.3
 -----
-* [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. This is released disabled and is behind a feature flag. [#19616, #19611, #19590]
 * [*] Fixed a minor UI issue where the segmented control under My SIte was being clipped when "Home" is selected. [#19595]
 * [*] Fixed an issue where the site wasn't removed and the app wasn't refreshed after disconnecting the site from WordPress.com. [#19634]
 * [*] [internal] Fixed an issue where Jetpack extensions were conflicting with WordPress extensions. [#19665]

diff --git a/WordPress/Classes/Services/JetpackNotificationMigrationService.swift b/WordPress/Classes/Services/JetpackNotificationMigrationService.swift
@@ -22,7 +22,7 @@ final class JetpackNotificationMigrationService: JetpackNotificationMigrationSer
     private let jetpackNotificationMigrationDefaultsKey = "jetpackNotificationMigrationDefaultsKey"
 
     private var jetpackMigrationPreventDuplicateNotifications: Bool {
-        return featureFlagStore.value(for: FeatureFlag.jetpackMigrationPreventDuplicateNotifications)
+        return FeatureFlag.jetpackMigrationPreventDuplicateNotifications.enabled
     }
 
     var wordPressNotificationsEnabled: Bool {

diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -123,7 +123,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .newCoreDataContext:
             return true
         case .jetpackMigrationPreventDuplicateNotifications:
-            return true
+            return false
         case .jetpackFeaturesRemovalPhaseOne:
             return false
         case .jetpackFeaturesRemovalPhaseTwo:

diff --git a/WordPress/WordPressTest/JetpackNotificationMigrationServiceTests.swift b/WordPress/WordPressTest/JetpackNotificationMigrationServiceTests.swift
@@ -138,7 +138,11 @@ private class RemoteNotificationRegisterMock: RemoteNotificationRegister {
 }
 
 private class RemoteFeatureFlagStoreMock: RemoteFeatureFlagStore {
-    var value = false
+    var value = false {
+        didSet {
+            try? FeatureFlagOverrideStore().override(FeatureFlag.jetpackMigrationPreventDuplicateNotifications, withValue: value)
+        }
+    }
 
     override func value(for flag: OverrideableFlag) -> Bool {
         return value