Merge branch 'trunk' into xcode-14

Author: crazytonyli

.buildkite/commands/run-ui-tests.sh

@@ -6,6 +6,14 @@ IOS_VERSION=$3
 
 echo "Running $TEST_NAME on $DEVICE for iOS $IOS_VERSION"
 
+# Run this at the start to fail early if value not available
+echo '--- :test-analytics: Configuring Test Analytics'
+if [[ $DEVICE =~ ^iPhone ]]; then
+  export BUILDKITE_ANALYTICS_TOKEN=$BUILDKITE_ANALYTICS_TOKEN_UI_TESTS_IPHONE
+else
+  export BUILDKITE_ANALYTICS_TOKEN=$BUILDKITE_ANALYTICS_TOKEN_UI_TESTS_IPAD
+fi
+
 # Workaround for https://github.com/Automattic/buildkite-ci/issues/79
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler

.buildkite/commands/run-unit-tests.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -eu
 
+# Run this at the start to fail early if value not available
+echo '--- :test-analytics: Configuring Test Analytics'
+export BUILDKITE_ANALYTICS_TOKEN=$BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS
+
 echo "--- 📦 Downloading Build Artifacts"
 buildkite-agent artifact download build-products.tar .
 tar -xf build-products.tar

.rubocop.yml

@@ -1,14 +1,25 @@
+AllCops:
+  Exclude:
+    - DerivedData/**/*
+    - Pods/**/*
+    - vendor/**/*
+  NewCops: enable
+
 Metrics/BlockLength:
   Exclude:
     - fastlane/Fastfile
 
+Metrics/MethodLength:
+  Max: 20
+
 Style/AsciiComments:
   Exclude:
     - fastlane/Fastfile
 
 Layout/LineLength:
   Exclude:
     - fastlane/Fastfile
+    - Podfile
 
 Naming/FileName:
   Exclude:

CHANGELOG.md

@@ -0,0 +1,15 @@
+<!--
+Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
+-->
+
+## 10.1
+This release has several fixes that makes it easier for you to take payments from the app. We’ve also added a new Help Center FAQ page that makes it easier for you to login to the app.
+Please continue to send us feedback – we are listening!
+
+## 10.0
+We made it much easier to find everything about accepting payments in the app. Head on to the Payments section from the Menu! We also fixed an issue where you might be unnecessarily blocked from taking payments.
+We also made various enhancements to our login flows to help you get started quickly with the app.
+Lastly, we’ve made some tweaks to performance. But we’re not done. Look forward to more improvements in the future. Please keep sending your feedback!
+
+## 9.9
+This release has a few improvements to your login experience, including the option to use your `wp-admin` site credentials and magic link option to login. Please continue to send us feedback – we are listening!

CODEOWNERS

@@ -0,0 +1,3 @@
+/WooCommerce/UITestsFoundation/ @woocommerce/mobile-ui-testing-squad
+/WooCommerce/WooCommerceUITests/ @woocommerce/mobile-ui-testing-squad
+/WooCommerce/WooCommerceScreenshots/ @woocommerce/mobile-ui-testing-squad

Experiments/Experiments/ABTest.swift

@@ -7,23 +7,56 @@ public enum ABTest: String, CaseIterable {
     /// `An enum with no cases cannot declare a raw type`
     case null
 
+    /// A/A test for ExPlat integration in the logged in state.
+    /// Experiment ref: pbxNRc-1QS-p2
+    ///
+    case aaTest202209 = "woocommerceios_explat_aa_test_logged_in_202209"
+
+    /// A/A test to make sure there is no bias in the logged out state.
+    /// Experiment ref: pbxNRc-1S0-p2
+    case aaTestLoggedOut202208 = "woocommerceios_explat_aa_test_logged_out_202208"
+
+    /// A/B test for promoting linked products in Product Details.
+    /// Experiment ref: pbxNRc-1Pp-p2
+    case linkedProductsPromo = "woocommerceios_product_details_linked_products_banner"
+
+    /// A/B test for the login button order on the prologues screen.
+    /// Experiment ref: pbxNRc-1VA-p2
+    case loginPrologueButtonOrder = "woocommerceios_login_prologue_button_order"
+
     /// Returns a variation for the given experiment
-    var variation: Variation {
-        return ExPlat.shared?.experiment(self.rawValue) ?? .control
+    public var variation: Variation {
+        ExPlat.shared?.experiment(rawValue) ?? .control
     }
 }
 
 public extension ABTest {
     /// Start the AB Testing platform if any experiment exists
     ///
-    static func start() {
-        guard ABTest.allCases.count > 1 else {
-            return
-        }
+    static func start() async {
+        await withCheckedContinuation { continuation in
+            guard ABTest.allCases.count > 1 else {
+                return continuation.resume(returning: ())
+            }
 
-        let experimentNames = ABTest.allCases.filter { $0 != .null }.map { $0.rawValue }
-        ExPlat.shared?.register(experiments: experimentNames)
+            let experimentNames = ABTest.allCases.filter { $0 != .null }.map { $0.rawValue }
+            ExPlat.shared?.register(experiments: experimentNames)
 
-        ExPlat.shared?.refresh()
+            ExPlat.shared?.refresh {
+                continuation.resume(returning: ())
+            }
+        } as Void
+    }
+}
+
+public extension Variation {
+    /// Used in an analytics event property value.
+    var analyticsValue: String {
+        switch self {
+        case .control:
+            return "control"
+        case .treatment(let string):
+            return string.map { "treatment: \($0)" } ?? "treatment"
+        }
     }
 }

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -7,8 +7,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .barcodeScanner:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .orderListFilters:
-            return true
         case .jetpackConnectionPackageSupport:
             return true
         case .hubMenu:
@@ -35,10 +33,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .inPersonPaymentGatewaySelection:
-            return true
-        case .unifiedOrderEditing:
-            return true
         case .backgroundProductImageUpload:
             return true
         case .appleIDAccountDeletion:
@@ -48,7 +42,15 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .loginPrologueOnboarding:
             return true
         case .loginErrorNotifications:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
+        case .loginPrologueOnboardingSurvey:
+            return true
+        case .loginMagicLinkEmphasis:
+            return true
+        case .loginMagicLinkEmphasisM2:
+            return true
+        case .promptToEnableCodInIppOnboarding:
+            return true
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -14,10 +14,6 @@ public enum FeatureFlag: Int {
     ///
     case reviews
 
-    /// Display the bar for displaying the filters in the Order List
-    ///
-    case orderListFilters
-
     /// Allows sites with plugins that include Jetpack Connection Package and without Jetpack-the-plugin to connect to the app
     ///
     case jetpackConnectionPackageSupport
@@ -70,14 +66,6 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsOnboardingM1
 
-    /// Enable selection of payment gateway to use for In-Person Payments when there is more than one available
-    ///
-    case inPersonPaymentGatewaySelection
-
-    /// Enable order editing from the order detailed screen.
-    ///
-    case unifiedOrderEditing
-
     /// Enable image upload after leaving the product form
     ///
     case backgroundProductImageUpload
@@ -101,4 +89,20 @@ public enum FeatureFlag: Int {
     /// Local notifications scheduled 24 hours after certain login errors
     ///
     case loginErrorNotifications
+
+    /// Whether to show a survey at the end of the login onboarding screen after feature carousel
+    ///
+    case loginPrologueOnboardingSurvey
+
+    /// Whether to prefer magic link to password in the login flow
+    ///
+    case loginMagicLinkEmphasis
+
+    /// Whether to show the magic link as a secondary button instead of a table view cell on the password screen
+    ///
+    case loginMagicLinkEmphasisM2
+
+    /// Whether to include the Cash on Delivery enable step in In-Person Payment onboarding
+    ///
+    case promptToEnableCodInIppOnboarding
 }

Fakes/Fakes/Networking.generated.swift

@@ -579,7 +579,18 @@ extension PaymentGateway {
             title: .fake(),
             description: .fake(),
             enabled: .fake(),
-            features: .fake()
+            features: .fake(),
+            instructions: .fake()
+        )
+    }
+}
+extension PaymentGateway.Setting {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> PaymentGateway.Setting {
+        .init(
+            settingID: .fake(),
+            value: .fake()
         )
     }
 }