Repository navigation
Remove the Jetpack features removal phases no one can reach - #26281
Merged
Merged
Conversation
Collaborator
Generated by 🚫 Danger |
6 tasks done
jkmassel
marked this pull request as ready for review
October 29, 2026 04:27
jkmassel
force-pushed
the
jkmassel/remove-unreachable-jetpack-phases
branch
from
October 29, 2026 21:26
05999c7 to
5e6f21a
Compare
Base automatically changed from
jkmassel/remove-jetpack-removal-flags
to
trunk
October 29, 2026 23:07
With the phase now fixed, only `normal`, `selfHosted` and `staticScreens` can happen. This deletes phases one to four and new users, plus everything that only they used: per-phase overlay copy and frequencies, the removal deadline, the phase four overlay, the bottom menu card, the "moving soon" badge text, and the remote config parameters behind them.
jkmassel
force-pushed
the
jkmassel/remove-unreachable-jetpack-phases
branch
from
October 29, 2026 23:07
5e6f21a to
87bdc5f
Compare
crazytonyli
approved these changes
Oct 30, 2026
3 of 4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Deletes the Jetpack features removal phases that no one can reach after #26280. Stacked on #26280. No behaviour change.
Summary
After #26280 the phase is fixed, so
GeneralPhaseonly ever takesnormal,selfHostedorstaticScreens, andSiteCreationPhaseonlynormalortwo. This deletes the other phases and everything that only they used.Changes
GeneralPhase: removes.one,.two,.three,.fourand.newUsers, plusfrequencyConfig(every remaining phase used the default).SiteCreationPhase: removes.one.JetpackFullscreenOverlayGeneralViewModel: keeps the self-hosted copy and the feature-specific animations and button titles. Phase one to four and new-users copy is gone, along with the removal-deadline subtitle and the blog post links.JetpackNewUsersOverlaySecondaryView: deleted; only the new-users overlay showed it.JetpackOverlaySource.phaseFourOverlayand the phase-four branch inMySiteViewControllerare gone; My Site always uses.appOpen.JetpackBrandingTextProvider: always returns "Jetpack powered". Static screens and normal phases both used that text, and the "moving soon" / "moving in N days" text was phase three only. Thescreen:argument is gone, so the nine callers change by one line each.JetpackBrandingMenuCardPresenter: only the self-hosted card is left.shouldShowBottomCard()could never returntrue, so it and the bottom card section inBlogDetailsTableViewModelare removed. The unusedremoteConfigStoreparameter is gone too.JetpackBrandingCoordinator.shouldShowBannerForJetpackDependentFeatures()is nowphase == .staticScreens.RemoteConfigParameter: removesjetpackDeadline,phaseFourOverlayFrequencyand the fivephase…BlogPostUrlparameters.removalDeadline()goes with them: no remaining phase shows the deadline.phaseNewUsersBlogPostUrlandphaseSelfHostedBlogPostUrlwere already unused on trunk.NSLocalizedStringcall sites only.Localizable.stringsis regenerated at release time. The self-hosted menu card keeps itsjetpack.menuCard.newUsers.titlekey so existing translations still apply.currentAppUITypeand the "based on current phase" fallbacks still have a job: the phase changes at runtime when someone signs in to or out of WordPress.com (.selfHosted↔.staticScreens), andreloadUIIfNeededrelies on that. They are unchanged apart from simpler switches.Left for a follow-up
JetpackBrandingMenuCardCellstill lays out a.compactcard type that nothing creates now.JetpackBrandedScreen.featureNameandisPluralonly fed the phase three badge text and are now unused.Formatting
Only the two overlay view models were run through
swift-format, since most of their lines changed. The other touched files still had formatting drift on trunk; this PR adds none, and reformatting them would bury the real change.Test plan
WordPressUnitTestsplan on an iPhone 17 Pro (iOS 27.0) simulator — 4,173 passed, 0 failed, 5 skippedJetpackBrandingMenuCardPresenterTestsrewritten around the self-hosted card;JetpackBrandingTextProviderTestsdeleted (the text is a constant); the negative-frequencyOverlayFrequencyTrackerTestscase now uses the.statssourceTrunk vs this PR screenshots
The self-hosted site is a local WordPress that reports a connected Jetpack through
wp.getOptions. On first launch this PR also showed the app-open overlay (screenshot); trunk shows the same overlay from the menu card above. The Reader screenshots are cropped to hide followed P2 names. On both builds the Menus banner sits under the tab bar; that's pre-existing.