Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Jetpack Focus] Revert Jetpack Notifications Disabling Feature Flag and Release Notes #19735

Merged
merged 4 commits into from
Dec 6, 2022
Merged

[Jetpack Focus] Revert Jetpack Notifications Disabling Feature Flag and Release Notes #19735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e94bcee
Disable jetpackMigrationPreventDuplicateNotifications Feature Flag
staskus Dec 5, 2022
ac5fc43
Revert changes in RELEASE-NOTES.txt
staskus Dec 5, 2022
a325d3d
Merge remote-tracking branch 'origin/release/21.3' into task/disable-…
twstokes Dec 5, 2022
75c637f
Do not depend on remote feature flags
staskus Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/JetpackNotificationMigrationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion WordPress/WordPressTest/JetpackNotificationMigrationServiceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down