Enable site creation for WP users with no sites

RELEASE-NOTES.txt

@@ -11,6 +11,7 @@
 * [**] Block Editor: Media uploads that failed due to lack of internet connectivity automatically retry once a connection is re-established [https://github.com/wordpress-mobile/WordPress-iOS/pull/22238]
 * [**] Block Editor: Manually retrying a single failed media upload will retry all failed media uploads in a post [https://github.com/wordpress-mobile/WordPress-iOS/pull/22240]
 * [*] [internal] Drop iOS 14 Support: Remove deprecated UIDocumentPickerViewController API [#22286]
+* [**] [internal] Site creation is re-enabled for WordPress users with no sites. [#22415]
 
 24.0
 -----

WordPress/Classes/ViewRelated/Blog/QuickStartPromptViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -30,7 +30,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="w31-gj-Dsv">
-                    <rect key="frame" x="20" y="124" width="374" height="586"/>
+                    <rect key="frame" x="20" y="128" width="374" height="582"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="wS6-OQ-uc5">
                             <rect key="frame" x="0.0" y="0.0" width="374" height="110"/>

WordPress/Classes/ViewRelated/Domains/DomainSelectionViewController.swift

@@ -360,7 +360,6 @@ final class DomainSelectionViewController: CollapsableHeaderViewController {
             return
         }
 
-
         trackDomainsSelection(selectedDomain)
 
         let onFailure: () -> () = { [weak self] in

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift

@@ -130,7 +130,7 @@ class JetpackFeaturesRemovalCoordinator: NSObject {
         if RemoteFeatureFlag.jetpackFeaturesRemovalPhaseNewUsers.enabled(using: featureFlagStore)
             || RemoteFeatureFlag.jetpackFeaturesRemovalPhaseFour.enabled(using: featureFlagStore)
             || RemoteFeatureFlag.jetpackFeaturesRemovalStaticPosters.enabled(using: featureFlagStore) {
-            return .two
+            return Self.hasBlog() ? .two : .normal
         }
         if RemoteFeatureFlag.jetpackFeaturesRemovalPhaseThree.enabled(using: featureFlagStore)
             || RemoteFeatureFlag.jetpackFeaturesRemovalPhaseTwo.enabled(using: featureFlagStore)
@@ -290,12 +290,16 @@ class JetpackFeaturesRemovalCoordinator: NSObject {
         presentOverlay(navigationViewController: navigationViewController, in: viewController)
     }
 
-    private static func presentOverlay(navigationViewController: UINavigationController,
-                                       in viewController: UIViewController,
-                                       fullScreen: Bool = false) {
+    static func presentOverlay(navigationViewController: UINavigationController,
+                               in viewController: UIViewController,
+                               fullScreen: Bool = false) {
         let shouldUseFormSheet = WPDeviceIdentification.isiPad() || !fullScreen
         navigationViewController.modalPresentationStyle = shouldUseFormSheet ? .formSheet : .fullScreen
 
         viewController.present(navigationViewController, animated: true)
     }
+
+    private static func hasBlog() -> Bool {
+        Blog.count(in: ContextManager.sharedInstance().mainContext) > 0
+    }
 }

WordPress/Classes/ViewRelated/Site Creation/Final Assembly/SiteAssemblyWizardContent.swift

@@ -229,7 +229,7 @@ final class SiteAssemblyWizardContent: UIViewController {
 
         if configuration.dismissalActionHandler == nil {
             configuration.dismissalActionHandler = { [weak self] in
-                guard let self = self else {
+                guard let self else {
                     return
                 }
                 self.dismissTapped()
@@ -255,6 +255,10 @@ final class SiteAssemblyWizardContent: UIViewController {
 
         self.errorStateViewController = errorStateViewController
     }
+
+    private func shouldPresentJetpackFeaturesRemovalOverlay() -> Bool {
+        AppConfiguration.isWordPress && Blog.count(in: ContextManager.sharedInstance().mainContext) == 1
+    }
 }
 
 // MARK: ErrorStateViewController support
@@ -309,6 +313,20 @@ extension SiteAssemblyWizardContent: NUXButtonViewControllerDelegate {
             guard let self = self else {
                 return
             }
+            if AppConfiguration.isWordPress && Blog.count(in: ContextManager.sharedInstance().mainContext) == 1 {
+                let viewModel = JetpackFullscreenOverlayGeneralViewModel(
+                    phase: .four,
+                    source: .phaseFourOverlay,
+                    blog: blog,
+                    coordinator: JetpackDefaultOverlayCoordinator()
+                )
+                let overlayViewController = JetpackFullscreenOverlayViewController(with: viewModel)
+                let navigationViewController = UINavigationController(rootViewController: overlayViewController)
+                JetpackFeaturesRemovalCoordinator.presentOverlay(
+                    navigationViewController: navigationViewController,
+                    in: RootViewCoordinator.sharedPresenter.rootViewController
+                )
+            }
             let completedSteps: [QuickStartTour] = self.siteCreator.hasSiteTitle ? [QuickStartSiteTitleTour(blog: blog)] : []
             self.showQuickStartPrompt(for: blog, completedSteps: completedSteps)
         }
@@ -319,6 +337,11 @@ extension SiteAssemblyWizardContent: NUXButtonViewControllerDelegate {
             return
         }
 
+        // Disable the prompt for WordPress when the blog has no domains.
+        guard AppConfiguration.isJetpack || isDashboardEnabled(for: blog) else {
+            return
+        }
+
         let rootViewController = RootViewCoordinator.sharedPresenter.rootViewController
         let quickstartPrompt = QuickStartPromptViewController(blog: blog)
         quickstartPrompt.onDismiss = { blog, showQuickStart in
@@ -328,4 +351,8 @@ extension SiteAssemblyWizardContent: NUXButtonViewControllerDelegate {
         }
         rootViewController.present(quickstartPrompt, animated: true)
     }
+
+    private func isDashboardEnabled(for blog: Blog) -> Bool {
+        return JetpackFeaturesRemovalCoordinator.jetpackFeaturesEnabled() && blog.isAccessibleThroughWPCom()
+    }
 }

WordPress/Classes/ViewRelated/Site Creation/Wizard/SiteCreationWizardLauncher.swift

@@ -7,7 +7,7 @@ final class SiteCreationWizardLauncher {
     }()
 
     let steps: [SiteCreationStep] = {
-        if RemoteFeatureFlag.plansInSiteCreation.enabled() {
+        if RemoteFeatureFlag.plansInSiteCreation.enabled() && !AppConfiguration.isWordPress {
             return [
                 .intent,
                 .design,

WordPress/WordPressTest/JetpackFeaturesRemovalCoordinatorTests.swift

@@ -8,7 +8,7 @@ final class JetpackFeaturesRemovalCoordinatorTests: CoreDataTestCase {
     override func setUp() {
         contextManager.useAsSharedInstance(untilTestFinished: self)
         mockUserDefaults = InMemoryUserDefaults()
-        let account = AccountBuilder(contextManager.mainContext).build()
+        let account = AccountBuilder(contextManager.mainContext).with(username: "test-account-JetpackFeaturesRemovalCoordinatorTests").build()
         UserSettings.defaultDotComUUID = account.uuid
     }
 
@@ -250,16 +250,17 @@ final class JetpackFeaturesRemovalCoordinatorTests: CoreDataTestCase {
         XCTAssertEqual(phase, .one)
     }
 
-    func testSiteCreationPhaseTwo() {
+    func testSiteCreationPhaseTwo() throws {
         // Given
         let store = RemoteFeatureFlagStore(persistenceStore: mockUserDefaults)
 
         // When
         var flags = generateFlags(phaseOne: false, phaseTwo: false, phaseThree: false, phaseFour: true, phaseNewUsers: false, phaseSelfHosted: false)
         let remote = MockFeatureFlagRemote(flags: flags)
         store.update(using: remote, waitOn: self)
+        let blog = BlogBuilder(mainContext).build()
+        try mainContext.save()
         var phase = JetpackFeaturesRemovalCoordinator.siteCreationPhase(featureFlagStore: store)
-
         // Then
         XCTAssertEqual(phase, .two)
 
@@ -273,14 +274,38 @@ final class JetpackFeaturesRemovalCoordinatorTests: CoreDataTestCase {
         XCTAssertEqual(phase, .two)
     }
 
-    func testSiteCreationPhaseTwoPrecedence() {
+    func testSiteCreationPhaseNormalWhenUserHasNoBlog() throws {
+        // Given
+        let store = RemoteFeatureFlagStore(persistenceStore: mockUserDefaults)
+
+        // When
+        var flags = generateFlags(phaseOne: false, phaseTwo: false, phaseThree: false, phaseFour: true, phaseNewUsers: false, phaseSelfHosted: false)
+        let remote = MockFeatureFlagRemote(flags: flags)
+        store.update(using: remote, waitOn: self)
+        var phase = JetpackFeaturesRemovalCoordinator.siteCreationPhase(featureFlagStore: store)
+        // Then
+        XCTAssertEqual(phase, .normal)
+
+        // When
+        flags = generateFlags(phaseOne: false, phaseTwo: false, phaseThree: false, phaseFour: false, phaseNewUsers: true, phaseSelfHosted: false)
+        remote.flags = flags
+        store.update(using: remote, waitOn: self)
+        phase = JetpackFeaturesRemovalCoordinator.siteCreationPhase(featureFlagStore: store)
+
+        // Then
+        XCTAssertEqual(phase, .normal)
+    }
+
+    func testSiteCreationPhaseTwoPrecedence() throws {
         // Given
         let store = RemoteFeatureFlagStore(persistenceStore: mockUserDefaults)
 
         // When
         var flags = generateFlags(phaseOne: true, phaseTwo: true, phaseThree: true, phaseFour: true, phaseNewUsers: false, phaseSelfHosted: false)
         let remote = MockFeatureFlagRemote(flags: flags)
         store.update(using: remote, waitOn: self)
+        let blog = BlogBuilder(mainContext).build()
+        try mainContext.save()
         var phase = JetpackFeaturesRemovalCoordinator.siteCreationPhase(featureFlagStore: store)
 
         // Then