Merge branch 'trunk' into issue/7944-product-preview-flow

# Conflicts:
#	Experiments/Experiments/FeatureFlag.swift
#	WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

Author: ealeksandrov

Experiments/Experiments/ABTest.swift

@@ -14,11 +14,7 @@ public enum ABTest: String, CaseIterable {
 
     /// A/A test to make sure there is no bias in the logged out state.
     /// Experiment ref: pbxNRc-1S0-p2
-    case aaTestLoggedOut202209 = "woocommerceios_explat_aa_test_logged_out_202209"
-
-    /// A/B test for the login button order on the prologues screen.
-    /// Experiment ref: pbxNRc-1VA-p2
-    case loginPrologueButtonOrder = "woocommerceios_login_prologue_button_order_202209"
+    case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
 
     /// Returns a variation for the given experiment
     public var variation: Variation {
@@ -32,7 +28,7 @@ public enum ABTest: String, CaseIterable {
         switch self {
         case .aaTestLoggedIn202210:
             return .loggedIn
-        case .aaTestLoggedOut202209, .loginPrologueButtonOrder:
+        case .aaTestLoggedOut:
             return .loggedOut
         case .null:
             return .none

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -45,10 +45,12 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .storeCreationMVP:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .productsOnboarding:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .simplifiedLoginFlowI1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .justInTimeMessagesOnDashboard:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .productsOnboarding:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -86,12 +86,16 @@ public enum FeatureFlag: Int {
     ///
     case storeCreationMVP
 
-    /// Hides products onboarding development.
-    ///
-    case productsOnboarding
-
     /// Temporary feature flag for the simplified login flow.
     /// TODO: replace with A/B testing.
     ///
     case simplifiedLoginFlowI1
+
+    /// Just In Time Messages on Dashboard
+    ///
+    case justInTimeMessagesOnDashboard
+
+    /// Hides products onboarding development.
+    ///
+    case productsOnboarding
 }

Networking/Networking/Model/JustInTimeMessage.swift

@@ -3,7 +3,7 @@ import Codegen
 
 /// Just In Time Message
 /// Also referred to as JITM, these messages are triggered on a per WPcom user basis, and can be requested for particular contexts within the app.
-/// They are generally displayed as a title, description, and CTA button
+/// They are generally displayed as a title, description, and Call To Action (CTA) button
 ///
 public struct JustInTimeMessage: GeneratedCopiable, GeneratedFakeable, Equatable {
     /// Site Identifier
@@ -18,15 +18,15 @@ public struct JustInTimeMessage: GeneratedCopiable, GeneratedFakeable, Equatable
     ///
     public let featureClass: String
 
-    /// Validity of the JITM in seconds
+    /// TTL, or Time To Live: validity of the JITM's client-side dismissal in seconds, only relevant after dismissal.
     ///
     public let ttl: Int64
 
     /// Content of the JITM: in particular, the title and description of the message
     ///
     public let content: Content
 
-    /// The Call to Action for the JITM: in particular, the button text and link to open
+    /// CTA, or Call to Action: button details for the JITM: in particular, the button text and link to open
     ///
     public let cta: CTA
 

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', '~> 3.2.0'
-#   pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  pod 'WordPressAuthenticator', '~> 3.3.0-beta.2'
+  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
   # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
   # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 

Podfile.lock

@@ -42,8 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (3.2.0):
-    - Alamofire (~> 4.8)
+  - WordPressAuthenticator (3.3.0-beta.2):
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
@@ -92,7 +91,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.7)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 3.2.0)
+  - WordPressAuthenticator (~> 3.3.0-beta.2)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -102,6 +101,8 @@ DEPENDENCIES:
   - ZendeskSupportSDK (~> 5.0)
 
 SPEC REPOS:
+  https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressAuthenticator
   trunk:
     - Alamofire
     - AppAuth
@@ -124,7 +125,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressAuthenticator
     - WordPressKit
     - WordPressShared
     - WordPressUI
@@ -162,7 +162,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: ee31d9b0420d2ab7a98e7fe931d3333bf97a47b2
+  WordPressAuthenticator: cafaace4519c72caef6bf950204bf21380194894
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 2824ed96b744a10c5fd0ac69b7e99ae9e1cdeb7d
+PODFILE CHECKSUM: 0f7a7c8c049a0c2ca072d18e289ac2889027a4f7
 
 COCOAPODS: 1.11.3

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -579,6 +579,7 @@ extension WooAnalyticsEvent {
             case paymentMethods = "payment_methods"
             case productDetail = "product_detail"
             case settings
+            case myStore = "my_store"
         }
 
         /// Keys for the Feature Card properties

WooCommerce/Classes/AppDelegate.swift

@@ -405,8 +405,7 @@ private extension AppDelegate {
         if versionOfLastRun == nil {
             // First run after a fresh install
             ServiceLocator.analytics.track(.applicationInstalled,
-                                           withProperties: ["after_abtest_setup": true,
-                                                            "prologue_experiment_variant": ABTest.loginPrologueButtonOrder.variation.analyticsValue])
+                                           withProperties: ["after_abtest_setup": true])
         } else if versionOfLastRun != currentVersion {
             // App was upgraded
             ServiceLocator.analytics.track(.applicationUpgraded, withProperties: ["previous_version": versionOfLastRun ?? String()])

WooCommerce/Classes/Authentication/AuthenticationConstants.swift

@@ -25,6 +25,13 @@ struct AuthenticationConstants {
         comment: "Sign in instructions on the 'log in using WordPress.com account' screen."
     )
 
+    /// Get started instructions when simplified login is enabled.
+    /// 
+    static let getStartedInstructionsForSimplifiedLogin = NSLocalizedString(
+        "Enter your email address to get started.",
+        comment: "Sign in instructions on the 'log in using WordPress.com account' screen."
+    )
+
     /// What is WordPress.com? link (Continue with WordPress.com)
     ///
     static let whatIsWPComLinkTitle = NSLocalizedString(
@@ -58,6 +65,13 @@ struct AuthenticationConstants {
         comment: "Sign in instructions asking user to enter WordPress.com password to proceed with sign in using Apple process"
     )
 
+    /// Simplified Log In button
+    ///
+    static let loginButtonTitle = NSLocalizedString(
+        "Log In",
+        comment: "Button title in the simplified login prologue screen. Takes the user to the login flow."
+    )
+
     /// Title of "Continue With WordPress.com" button in Login Prologue
     //
     static let continueWithWPButtonTitle = NSLocalizedString(
@@ -106,4 +120,18 @@ struct AuthenticationConstants {
         "If you continue with Apple and don't already have a WordPress.com account, you are creating an account and you agree to our _Terms of Service_.",
         comment: "Legal disclaimer for signing up. The underscores _..._ denote underline."
     )
+
+    /// Create a Store button in Simplified login flow
+    ///
+    static let createSiteButtonTitle = NSLocalizedString(
+        "Create a Store",
+        comment: "Button displayed on the prologue screen of the simplified login flow to create a new store"
+    )
+
+    /// Instructions for WPCom password
+    ///
+    static let wpcomPasswordInstructions = NSLocalizedString(
+        "Enter the password for your account.",
+        comment: "Instructional text shown when requesting the user's password for WPCom login."
+    )
 }