diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ff1bdaf51760..62b56a62b164 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,6 +2,7 @@ ----- * [*] Share extension navigation bar is no longer transparent [#19700] * [**] [internal] Upgrade React Native from 0.66.2 to 0.69.4 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5193] +* [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. [#19616, #19611, #19590] 21.3 ----- diff --git a/WordPress/Classes/Services/JetpackNotificationMigrationService.swift b/WordPress/Classes/Services/JetpackNotificationMigrationService.swift index 2c7a7e93945c..ec136e4e2776 100644 --- 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 FeatureFlag.jetpackMigrationPreventDuplicateNotifications.enabled + return featureFlagStore.value(for: FeatureFlag.jetpackMigrationPreventDuplicateNotifications) } private var notificationSettingsService: NotificationSettingsService? diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift index e23494719dff..4c0a345d7cd8 100644 --- 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 false + return true case .jetpackFeaturesRemovalPhaseOne: return false case .jetpackFeaturesRemovalPhaseTwo: