Merge branch 'trunk' into issue/7853-retrieval-and-view-jitm-analytics

# Conflicts:
#	WooCommerce/WooCommerceTests/ViewRelated/Dashboard/DashboardViewModelTests.swift

Author: joshheald

Experiments/Experiments/ABTest.swift

@@ -16,6 +16,10 @@ public enum ABTest: String, CaseIterable {
     /// Experiment ref: pbxNRc-1S0-p2
     case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
 
+    /// A/B test for the Products Onboarding banner on the My Store dashboard.
+    /// Experiment ref: pbxNRc-26F-p2
+    case productsOnboardingBanner = "woocommerceios_products_onboarding_first_product_banner"
+
     /// Returns a variation for the given experiment
     public var variation: Variation {
         ExPlat.shared?.experiment(rawValue) ?? .control
@@ -26,7 +30,7 @@ public enum ABTest: String, CaseIterable {
     /// When adding a new experiment, add it to the appropriate case depending on its context (logged-in or logged-out experience).
     public var context: ExperimentContext {
         switch self {
-        case .aaTestLoggedIn202210:
+        case .aaTestLoggedIn202210, .productsOnboardingBanner:
             return .loggedIn
         case .aaTestLoggedOut:
             return .loggedOut

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:
@@ -33,8 +33,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .searchProductsBySKU:
             return true
-        case .orderCreationSearchCustomers:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .wpcomSignup:
             guard isFeatureFlagEnabled(.simplifiedLoginFlowI1) else {
                 return buildConfig == .localDeveloper || buildConfig == .alpha

Experiments/Experiments/FeatureFlag.swift

@@ -70,10 +70,6 @@ public enum FeatureFlag: Int {
     ///
     case searchProductsBySKU
 
-    /// Enables the Search Customers functionality in the Order Creation screen
-    ///
-    case orderCreationSearchCustomers
-
     /// Enables signing up for a WP.com account.
     ///
     case wpcomSignup

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

RELEASE-NOTES.txt

@@ -2,7 +2,7 @@
 
 11.1
 -----
-
+- [**] You can now search customers when creating or editing an order. [https://github.com/woocommerce/woocommerce-ios/issues/7741]
 
 11.0
 -----

WooCommerce/Classes/Analytics/WooAnalyticsEvent.swift

@@ -1720,6 +1720,15 @@ extension WooAnalyticsEvent {
 //
 extension WooAnalyticsEvent {
     enum ProductsOnboarding {
+        enum Keys: String {
+            case type
+        }
+
+        enum CreationType: String {
+            case manual
+            case template
+        }
+
         /// Tracks when a store is eligible for products onboarding
         ///
         static func storeIsEligible() -> WooAnalyticsEvent {
@@ -1731,5 +1740,11 @@ extension WooAnalyticsEvent {
         static func bannerCTATapped() -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .productsOnboardingCTATapped, properties: [:])
         }
+
+        /// Trackas when the merchants selects a product creation type.
+        ///
+        static func productCreationTypeSelected(type: CreationType) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .addProductCreationTypeSelected, properties: [Keys.type.rawValue: type.rawValue])
+        }
     }
 }

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -265,6 +265,8 @@ public enum WooAnalyticsStat: String {
     case orderCreateButtonTapped = "order_create_button_tapped"
     case orderCreationSuccess = "order_creation_success"
     case orderCreationFailed = "order_creation_failed"
+    case orderCreationCustomerAdded = "order_creation_customer_added"
+    case orderCreationCustomerSearch = "order_creation_customer_search"
     case orderContactAction = "order_contact_action"
     case orderCustomerAdd = "order_customer_add"
     case orderEditButtonTapped = "order_edit_button_tapped"
@@ -424,6 +426,7 @@ public enum WooAnalyticsStat: String {
 
     // MARK: Add Product Events
     //
+    case addProductCreationTypeSelected = "add_product_creation_type_selected"
     case addProductTypeSelected = "add_product_product_type_selected"
     case addProductPublishTapped = "add_product_publish_tapped"
     case addProductSaveAsDraftTapped = "add_product_save_as_draft_tapped"

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 ?