Merge branch 'trunk' into issue/8213-analytics-empty-state

Author: rachelmcr

Hardware/Hardware/CardReader/StripeCardReader/CardReaderDiscoveryMethod.swift

@@ -4,14 +4,14 @@ import StripeTerminal
 
 public enum CardReaderDiscoveryMethod {
     case localMobile
-    case bluetoothProximity
+    case bluetoothScan
 
     func toStripe() -> DiscoveryMethod {
         switch self {
         case .localMobile:
             return .localMobile
-        case .bluetoothProximity:
-            return .bluetoothProximity
+        case .bluetoothScan:
+            return .bluetoothScan
         }
     }
 }

Podfile

@@ -71,8 +71,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.2.0'
-  # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+  pod 'WordPressAuthenticator', '~> 4.3.0-beta.1'
+#   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,7 +42,7 @@ PODS:
   - WordPress-Aztec-iOS (1.11.0)
   - WordPress-Editor-iOS (1.11.0):
     - WordPress-Aztec-iOS (= 1.11.0)
-  - WordPressAuthenticator (4.2.0):
+  - WordPressAuthenticator (4.3.0-beta.1):
     - CocoaLumberjack (~> 3.5)
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
@@ -91,7 +91,7 @@ DEPENDENCIES:
   - Sourcery (~> 1.0.3)
   - StripeTerminal (~> 2.14)
   - WordPress-Editor-iOS (~> 1.11.0)
-  - WordPressAuthenticator (~> 4.2.0)
+  - WordPressAuthenticator (~> 4.3.0-beta.1)
   - WordPressKit (~> 4.49.0)
   - WordPressShared (~> 1.15)
   - WordPressUI (~> 1.12.5)
@@ -162,7 +162,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
   WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
   WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
-  WordPressAuthenticator: 27178591a805804bd27959f1f76ddcb94605916c
+  WordPressAuthenticator: f886178b7202cfb8adfd834fb6391b7970d18871
   WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
   WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: 8b243f1ea76d4db3aa638b50ef0d516185d01c2c
+PODFILE CHECKSUM: b5975e437e8925c28bb2d91af5f3e557e82ae34a
 
 COCOAPODS: 1.11.3

README.md

@@ -103,7 +103,7 @@ Please, remember to not add this information on your commits and PRs.
     - [Tracking Events](docs/tracking-events.md)
         - [Custom Properties](docs/tracking-events.md#custom-properties)
 - Quality & Testing
-    - [UI Tests](docs/UI-TESTS.md)
+    - [UI Tests](WooCommerce/WooCommerceUITests/README.md)
     - [Testing Card Present Payments](docs/stripe-tests.md)
     - [Beta Testing](https://woocommercehalo.wordpress.com/setup/join-ios-beta/)
     - [Issue Triage](docs/issue-triage.md)

RELEASE-NOTES.txt

@@ -3,10 +3,10 @@
 11.5
 -----
 - [*] Account deletion is now supported for all users in settings or in the empty stores screen. [https://github.com/woocommerce/woocommerce-ios/pull/8179]
+- [*] In-Person Payments: We removed any references to Simple Payments from Orders, and the red badge from the Menu tab and Menu Payments icon announcing the new Payments section. [https://github.com/woocommerce/woocommerce-ios/pull/8183]
 
 11.4
 -----
-- [*] In-Person Payments: We removed any references to Simple Payments from Orders, and the red badge from the Menu tab and Menu Payments icon announcing the new Payments section. [https://github.com/woocommerce/woocommerce-ios/pull/8183] 
 - [*] Add System Status Report to ZenDesk support requests. [https://github.com/woocommerce/woocommerce-ios/pull/8171]
 
 

WooCommerce/Classes/Analytics/WooAnalyticsEvent+StoreCreation.swift

@@ -7,6 +7,8 @@ extension WooAnalyticsEvent {
             static let source = "source"
             static let url = "url"
             static let errorType = "error_type"
+            static let flow = "flow"
+            static let step = "step"
         }
 
         /// Tracked when the user taps on the CTA in store picker (logged in to WPCOM) to create a store.
@@ -16,22 +18,40 @@ extension WooAnalyticsEvent {
         }
 
         /// Tracked when a site is created from the store creation flow.
-        static func siteCreated(source: Source, siteURL: String) -> WooAnalyticsEvent {
+        static func siteCreated(source: Source, siteURL: String, flow: Flow) -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .siteCreated,
-                              properties: [Key.source: source.rawValue, Key.url: siteURL])
+                              properties: [Key.source: source.rawValue,
+                                           Key.url: siteURL,
+                                           Key.flow: flow.rawValue])
         }
 
         /// Tracked when site creation fails.
-        static func siteCreationFailed(source: Source, error: Error) -> WooAnalyticsEvent {
+        static func siteCreationFailed(source: Source, error: Error, flow: Flow) -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .siteCreationFailed,
-                              properties: [Key.source: source.rawValue],
+                              properties: [Key.source: source.rawValue, Key.flow: flow.rawValue],
                               error: error)
         }
 
         /// Tracked when the user dismisses the store creation flow before the flow is complete.
-        static func siteCreationDismissed(source: Source) -> WooAnalyticsEvent {
+        static func siteCreationDismissed(source: Source, flow: Flow) -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .siteCreationDismissed,
-                              properties: [Key.source: source.rawValue])
+                              properties: [Key.source: source.rawValue, Key.flow: flow.rawValue])
+        }
+
+        /// Tracked when the user reaches each step of the store creation flow.
+        static func siteCreationStep(step: Step) -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .siteCreationStep,
+                              properties: [Key.step: step.rawValue])
+        }
+
+        /// Tracked clicking on “Store Preview” button after a site is created successfully.
+        static func siteCreationSitePreviewed() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .siteCreationSitePreviewed, properties: [:])
+        }
+
+        /// Tracked when tapping on the “Manage my store” button on the store creation success screen.
+        static func siteCreationManageStoreTapped() -> WooAnalyticsEvent {
+            WooAnalyticsEvent(statName: .siteCreationManageStoreTapped, properties: [:])
         }
 
         /// Tracked when the user taps on the CTA in login prologue (logged out) to create a store.
@@ -84,6 +104,22 @@ extension WooAnalyticsEvent.StoreCreation {
         case storePicker = "store_picker"
         case loginEmailError = "login_email_error"
     }
+
+    /// The implementation of store creation flow - native (M2) or web (M1).
+    enum Flow: String {
+        case native = "native"
+        case web = "web"
+    }
+
+    /// Steps of the native store creation flow.
+    enum Step: String {
+        case storeName = "store_name"
+        case domainPicker = "domain_picker"
+        case storeSummary = "store_summary"
+        case planPurchase = "plan_purchase"
+        case webCheckout = "web_checkout"
+        case storeInstallation = "store_installation"
+    }
 }
 
 private extension CreateAccountError {

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -159,6 +159,7 @@ public enum WooAnalyticsStat: String {
     case sitePickerContinueTapped = "site_picker_continue_tapped"
     case sitePickerStoresShown = "site_picker_stores_shown"
     case sitePickerHelpButtonTapped = "site_picker_help_button_tapped"
+    case sitePickerLogoutButtonTapped = "site_picker_logout_tapped"
     case sitePickerNonWooSiteTapped = "site_picker_non_woo_site_tapped"
     case sitePickerSiteDiscovery = "site_picker_site_discovery"
     case sitePickerNewToWooTapped = "site_picker_new_to_woo_tapped"
@@ -171,6 +172,9 @@ public enum WooAnalyticsStat: String {
     case siteCreated = "login_woocommerce_site_created"
     case siteCreationFailed = "site_creation_failed"
     case siteCreationDismissed = "site_creation_dismissed"
+    case siteCreationStep = "site_creation_step"
+    case siteCreationSitePreviewed = "site_creation_site_previewed"
+    case siteCreationManageStoreTapped = "site_creation_store_management_opened"
     case loginPrologueCreateSiteTapped = "login_prologue_create_site_tapped"
     case signupFormLoginTapped = "signup_login_button_tapped"
     case signupSubmitted = "signup_submitted"

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -60,6 +60,7 @@ class AuthenticationManager: Authentication {
         let isWPComMagicLinkShownAsSecondaryActionOnPasswordScreen = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.loginMagicLinkEmphasisM2)
         let isSimplifiedLoginI1Enabled = ABTest.abTestLoginWithWPComOnly.variation != .control
         let isStoreCreationMVPEnabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.storeCreationMVP)
+        let isNativeJetpackSetupEnabled = ABTest.nativeJetpackSetupFlow.variation != .control
         let configuration = WordPressAuthenticatorConfiguration(wpcomClientId: ApiCredentials.dotcomAppId,
                                                                 wpcomSecret: ApiCredentials.dotcomSecret,
                                                                 wpcomScheme: ApiCredentials.dotcomAuthScheme,
@@ -86,7 +87,8 @@ class AuthenticationManager: Authentication {
                                                                 enableSocialLogin: !isSimplifiedLoginI1Enabled,
                                                                 emphasizeEmailForWPComPassword: true,
                                                                 wpcomPasswordInstructions:
-                                                                AuthenticationConstants.wpcomPasswordInstructions)
+                                                                AuthenticationConstants.wpcomPasswordInstructions,
+                                                                skipXMLRPCCheckForSiteDiscovery: isNativeJetpackSetupEnabled)
 
         let systemGray3LightModeColor = UIColor(red: 199/255.0, green: 199/255.0, blue: 204/255.0, alpha: 1)
         let systemLabelLightModeColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1)

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -507,6 +507,8 @@ private extension StorePickerViewController {
             return
         }
 
+        ServiceLocator.analytics.track(.sitePickerLogoutButtonTapped)
+
         delegate?.restartAuthentication()
     }
 

WooCommerce/Classes/Authentication/Jetpack Setup/LoginJetpackSetupCoordinator.swift

@@ -32,8 +32,8 @@ final class LoginJetpackSetupCoordinator: Coordinator {
         let siteCredentialUI = SiteCredentialLoginHostingViewController(
             siteURL: siteURL,
             connectionOnly: connectionOnly,
-            onLoginSuccess: { [weak self] xmlrpc in
-                self?.showSetupSteps(xmlrpc: xmlrpc)
+            onLoginSuccess: { [weak self] in
+                self?.showSetupSteps()
         })
         navigationController.present(UINavigationController(rootViewController: siteCredentialUI), animated: true)
     }
@@ -42,13 +42,13 @@ final class LoginJetpackSetupCoordinator: Coordinator {
 // MARK: Private helpers
 //
 private extension LoginJetpackSetupCoordinator {
-    func showSetupSteps(xmlrpc: String) {
+    func showSetupSteps() {
         let setupUI = LoginJetpackSetupHostingController(siteURL: siteURL, connectionOnly: connectionOnly, onStoreNavigation: { [weak self] connectedEmail in
             guard let self, let email = connectedEmail else { return }
             if email != self.stores.sessionManager.defaultAccount?.email {
                 // if the user authorized Jetpack with a different account, support them to log in with that account.
                 self.analytics.track(.loginJetpackSetupAuthorizedUsingDifferentWPCOMAccount)
-                self.showVerifyWPComAccount(email: email, xmlrpc: xmlrpc)
+                self.showVerifyWPComAccount(email: email)
             } else {
                 self.showStorePickerForLogin()
             }
@@ -61,10 +61,10 @@ private extension LoginJetpackSetupCoordinator {
         contentNavigationController.setViewControllers([setupUI], animated: true)
     }
 
-    func showVerifyWPComAccount(email: String, xmlrpc: String) {
+    func showVerifyWPComAccount(email: String) {
         WordPressAuthenticator.showVerifyEmailForWPCom(
             from: navigationController.presentedViewController ?? navigationController,
-            xmlrpc: xmlrpc,
+            xmlrpc: "",
             connectedEmail: email,
             siteURL: siteURL
         )