Merge pull request #7999 from woocommerce/issue/7997-simplifiedLogin-prologue

Simplified login: Prologue screen updates

Author: selanthiraiyan

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -18,7 +18,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .newToWooCommerceLinkInLoginPrologue:
-            return true
+            return false
         case .loginPrologueOnboarding:
             return true
         case .loginErrorNotifications:

Podfile

@@ -65,8 +65,8 @@ target 'WooCommerce' do
   pod 'Gridicons', '~> 1.2.0'
 
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressAuthenticator', '~> 4.0.0'
-  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  pod 'WordPressAuthenticator', '~> 4.1.0-beta.1'
+  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => 'f24fd9c6dbc73cfee583a7eba16fa81e2948fa43'
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 

Podfile.lock

@@ -42,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (4.0.0):
+  - WordPressAuthenticator (4.1.0-beta.1):
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
@@ -91,7 +91,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 4.0.0)
+  - WordPressAuthenticator (~> 4.1.0-beta.1)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -101,6 +101,8 @@ DEPENDENCIES:
   - ZendeskSupportSDK (~> 5.0)
 
 SPEC REPOS:
+  https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressAuthenticator
   trunk:
     - Alamofire
     - AppAuth
@@ -123,7 +125,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressAuthenticator
     - WordPressKit
     - WordPressShared
     - WordPressUI
@@ -161,7 +162,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: c0bdeec612e4e80d76ac7849f89d8405c1d43654
+  WordPressAuthenticator: 1f3dabd0f7e95afca4efdd3b528417419b66250b
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -177,6 +178,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 56e66ae89d30a0b6cfc246d43c71ba38eff01e0d
+PODFILE CHECKSUM: 4286e3bac570110f96d064f4359aec6a46b2406a
 
 COCOAPODS: 1.11.3

WooCommerce/Classes/Authentication/AuthenticationConstants.swift

@@ -121,10 +121,10 @@ struct AuthenticationConstants {
         comment: "Legal disclaimer for signing up. The underscores _..._ denote underline."
     )
 
-    /// Create a Store button in Simplified login flow
+    /// Get Started button in Simplified login flow
     ///
     static let createSiteButtonTitle = NSLocalizedString(
-        "Create a Store",
+        "Get Started",
         comment: "Button displayed on the prologue screen of the simplified login flow to create a new store"
     )
 

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -55,9 +55,6 @@ class AuthenticationManager: Authentication {
     func initialize(loggedOutAppSettings: LoggedOutAppSettingsProtocol) {
         let isWPComMagicLinkPreferredToPassword = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginMagicLinkEmphasis)
         let isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginMagicLinkEmphasisM2)
-        let isFeatureCarouselShown = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginPrologueOnboarding) == false
-        || (loggedOutAppSettings.hasFinishedOnboarding == true &&
-            ServiceLocator.featureFlagService.isFeatureFlagEnabled(.simplifiedLoginFlowI1) == false)
         let isSimplifiedLoginI1Enabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.simplifiedLoginFlowI1)
         let isStoreCreationMVPEnabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.storeCreationMVP)
         let configuration = WordPressAuthenticatorConfiguration(wpcomClientId: ApiCredentials.dotcomAppId,
@@ -117,7 +114,7 @@ class AuthenticationManager: Authentication {
                                                 navBarBadgeColor: .primary,
                                                 navBarBackgroundColor: .appBar,
                                                 prologueTopContainerChildViewController:
-                                                    LoginPrologueViewController(isFeatureCarouselShown: isFeatureCarouselShown),
+                                                    LoginPrologueViewController(isFeatureCarouselShown: false),
                                                 statusBarStyle: .default)
 
         let getStartedInstructions = isSimplifiedLoginI1Enabled ?

WooCommerce/Classes/Authentication/Prologue/LoginProloguePages.swift

@@ -26,10 +26,7 @@ enum LoginProloguePageType: CaseIterable {
         case .reviews:
             return NSLocalizedString("Monitor and approve your product reviews",
                                      comment: "Caption displayed in promotional screens shown during the login flow.")
-        case .getStarted:
-            return NSLocalizedString("Let’s get started!",
-                                     comment: "Caption displayed in the prologue screen shown after onboarding during the login flow.")
-        case .simplifiedLoginI1Intro:
+        case .getStarted, .simplifiedLoginI1Intro:
             return NSLocalizedString("WooCommerce is a customizable, open-source eCommerce platform built on WordPress.",
                                      comment: "Caption displayed in the simplified prologue screen")
         }
@@ -145,7 +142,7 @@ private extension LoginProloguePageTypeViewController {
 
         // Label style & layout
         titleLabel.font = {
-            if pageType == .simplifiedLoginI1Intro {
+            if pageType == .simplifiedLoginI1Intro || pageType == .getStarted {
                 return .headline
             } else if showsSubtitle {
                 return .font(forStyle: .title2, weight: .semibold)

WooCommerce/UITestsFoundation/Screens/Login/PrologueScreen.swift

@@ -30,13 +30,7 @@ public final class PrologueScreen: ScreenObject {
 
 extension PrologueScreen {
     static func findContinueButton(in app: XCUIApplication) -> XCUIElement {
-        let continueButton = app.buttons["Prologue Continue Button"]
-        if continueButton.waitForExistence(timeout: 1) {
-            return continueButton
-        } else {
-            // On simplified login flow, the button has different identifier
-            return app.buttons["Prologue Log In Button"]
-        }
+        app.buttons["Prologue Continue Button"]
     }
 
     public static func isSiteAddressLoginAvailable(in app: XCUIApplication = .init()) -> Bool {