Merge pull request #19894 from wordpress-mobile/task/19453-new-users-phase-card-and-display-logic

Jetpack Focus: New users phase menu card and overlay display logic

Author: hassaanelgarem

WordPress/Classes/Stores/RemoteFeatureFlagStore.swift

@@ -32,6 +32,7 @@ class RemoteFeatureFlagStore {
                     callback?()
                 case .failure(let error):
                     DDLogError("🚩 Unable to update Feature Flag Store: \(error.localizedDescription)")
+                    callback?()
             }
         }
     }

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -672,16 +672,17 @@ extension WordPressAppDelegate {
         }
     }
 
-    /// Updates the remote feature flags using an authenticated remote if an account exists, or using an anonymous remote if no account exists.
-    func updateFeatureFlags() {
-        do {
-            let defaultAccount = try WPAccount.lookupDefaultWordPressComAccount(in: mainContext)
-            let api = defaultAccount?.wordPressComRestV2Api ?? WordPressComRestApi.defaultApi()
-            let remote = FeatureFlagRemote(wordPressComRestApi: api)
-            remoteFeatureFlagStore.update(using: remote)
-        } catch {
-            DDLogError("Error fetching default user account: \(error)")
+    /// Updates the remote feature flags using an authenticated remote if a token is provided or an account exists
+    /// Otherwise an anonymous remote will be used
+    func updateFeatureFlags(authToken: String? = nil, completion: (() -> Void)? = nil) {
+        var api: WordPressComRestApi
+        if let authToken {
+            api = WordPressComRestApi.defaultV2Api(authToken: authToken)
+        } else {
+            api = WordPressComRestApi.defaultV2Api(in: mainContext)
         }
+        let remote = FeatureFlagRemote(wordPressComRestApi: api)
+        remoteFeatureFlagStore.update(using: remote, then: completion)
     }
 
     func updateRemoteConfig() {

WordPress/Classes/Utility/Networking/WordPressComRestApi+Defaults.swift

@@ -21,6 +21,21 @@ extension WordPressComRestApi {
         let token: String? = defaultAccount?.authToken
 
         return WordPressComRestApi.defaultApi(oAuthToken: token,
-                                              userAgent: WPUserAgent.wordPress())
+                                              userAgent: userAgent,
+                                              localeKey: localeKey)
+    }
+
+    @objc public static func defaultV2Api(authToken: String? = nil) -> WordPressComRestApi {
+        let userAgent = WPUserAgent.wordPress()
+        let localeKey = WordPressComRestApi.LocaleKeyV2
+        return WordPressComRestApi.defaultApi(oAuthToken: authToken,
+                                              userAgent: userAgent,
+                                              localeKey: localeKey)
+    }
+
+    @objc public static func defaultV2Api(in context: NSManagedObjectContext) -> WordPressComRestApi {
+        return WordPressComRestApi.defaultApi(in: context,
+                                              userAgent: WPUserAgent.wordPress(),
+                                              localeKey: WordPressComRestApi.LocaleKeyV2)
     }
 }

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayGeneralViewModel.swift

@@ -30,13 +30,19 @@ struct JetpackFullscreenOverlayGeneralViewModel: JetpackFullscreenOverlayViewMod
         case (.three, _):
             return true
 
-        // Phase Four: Show feature-collection overlays. Features are removed by this point so they are irrelevant.
-        case (.four, .card):
+        // Do not show feature overlays in phases where they are removed.
+        case (_, .stats):
             fallthrough
-        case (.four, .appOpen):
+        case (_, .reader):
+            fallthrough
+        case (_, .notifications):
+            return false
+
+        // Phase Four: Show feature-collection overlays.
+        case (.four, _):
             return true
 
-        // New Users Phase: Show feature-collection overlays. Features are removed by this point so they are irrelevant.
+        // New Users Phase: Show feature-collection overlays.
         case (.newUsers, _):
             return true
 

WordPress/Classes/ViewRelated/Jetpack/Branding/Menu Card/JetpackBrandingMenuCardPresenter.swift

@@ -47,6 +47,10 @@ class JetpackBrandingMenuCardPresenter {
             let description = Strings.phaseFourTitle
             let url = RemoteConfig(store: remoteConfigStore).phaseFourBlogPostUrl.value
             return .init(description: description, learnMoreButtonURL: url, type: .compact)
+        case .newUsers:
+            let description = Strings.newUsersPhaseTitle
+            let url = RemoteConfig(store: remoteConfigStore).phaseNewUsersBlogPostUrl.value
+            return .init(description: description, learnMoreButtonURL: url, type: .expanded)
         default:
             return nil
         }
@@ -70,6 +74,8 @@ class JetpackBrandingMenuCardPresenter {
         }
         switch phase {
         case .four:
+            fallthrough
+        case .newUsers:
             return true
         default:
             return false
@@ -184,5 +190,8 @@ private extension JetpackBrandingMenuCardPresenter {
         static let phaseFourTitle = NSLocalizedString("jetpack.menuCard.phaseFour.title",
                                                            value: "Switch to Jetpack",
                                                            comment: "Title of a button prompting users to switch to the Jetpack app.")
+        static let newUsersPhaseTitle = NSLocalizedString("jetpack.menuCard.newUsers.title",
+                                                           value: "Unlock your site’s full potential. Get stats, notifications and more with Jetpack.",
+                                                           comment: "Description inside a menu card prompting users to switch to the Jetpack app.")
     }
 }

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

@@ -691,6 +691,11 @@ private extension WordPressAuthenticationManager {
     private func syncWPCom(authToken: String, isJetpackLogin: Bool, onCompletion: @escaping () -> ()) {
         let service = WordPressComSyncService()
 
+        // Create a dispatch group to wait for both API calls.
+        let syncGroup = DispatchGroup()
+
+        // Sync account and blog
+        syncGroup.enter()
         service.syncWPCom(authToken: authToken, isJetpackLogin: isJetpackLogin, onSuccess: { account in
 
             /// HACK: An alternative notification to LoginFinished. Observe this instead of `WPSigninDidFinishNotification` for Jetpack logins.
@@ -699,14 +704,21 @@ private extension WordPressAuthenticationManager {
             let notification = isJetpackLogin == true ? .wordpressLoginFinishedJetpackLogin : Foundation.Notification.Name(rawValue: WordPressAuthenticator.WPSigninDidFinishNotification)
             NotificationCenter.default.post(name: notification, object: account)
 
-            // Refresh Remote Feature Flags
-            WordPressAppDelegate.shared?.updateFeatureFlags()
+            syncGroup.leave()
+        }, onFailure: { _ in
+            syncGroup.leave()
+        })
 
-            onCompletion()
+        // Refresh Remote Feature Flags
+        syncGroup.enter()
+        WordPressAppDelegate.shared?.updateFeatureFlags(authToken: authToken, completion: {
+            syncGroup.leave()
+        })
 
-        }, onFailure: { _ in
+        // Sync done
+        syncGroup.notify(queue: .main) {
             onCompletion()
-        })
+        }
     }
 
     /// Synchronizes a WordPress.org account with the specified credentials.

WordPress/WordPressTest/JetpackBrandingMenuCardPresenterTests.swift

@@ -70,7 +70,7 @@ final class JetpackBrandingMenuCardPresenterTests: XCTestCase {
 
         // Phase New Users
         remoteFeatureFlagsStore.removalPhaseNewUsers = true
-        XCTAssertFalse(presenter.shouldShowBottomCard())
+        XCTAssertTrue(presenter.shouldShowBottomCard())
     }
 
     func testPhaseThreeCardConfig() throws {