Merge branch 'trunk' into xcode-14

Author: crazytonyli

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

@@ -2,9 +2,8 @@
 
 TEST_NAME=$1
 DEVICE=$2
-IOS_VERSION=$3
 
-echo "Running $TEST_NAME on $DEVICE for iOS $IOS_VERSION"
+echo "Running $TEST_NAME on $DEVICE"
 
 # Run this at the start to fail early if value not available
 echo '--- :test-analytics: Configuring Test Analytics'
@@ -36,7 +35,7 @@ echo "--- 🧪 Testing"
 xcrun simctl list >> /dev/null
 rake mocks &
 set +e
-bundle exec fastlane test_without_building name:"$TEST_NAME" device:"$DEVICE" ios_version:"$IOS_VERSION"
+bundle exec fastlane test_without_building name:"$TEST_NAME" device:"$DEVICE"
 TESTS_EXIT_STATUS=$?
 set -e
 

.buildkite/pipeline.yml

@@ -68,7 +68,7 @@ steps:
   # UI Tests
   #################
   - label: "🔬 UI Tests (iPhone)"
-    command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 11' 15.0
+    command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 11'
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins
@@ -79,7 +79,7 @@ steps:
           context: "UI Tests (iPhone)"
 
   - label: "🔬 UI Tests (iPad)"
-    command: .buildkite/commands/run-ui-tests.sh UITests "iPad Air (4th generation)" 15.0
+    command: .buildkite/commands/run-ui-tests.sh UITests "iPad Air (5th generation)"
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins

CHANGELOG.md

@@ -2,6 +2,11 @@
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
 
+## 10.3
+
+More love for In-Person Payments and Analytics this time around. We fixed a bug which could prevent you from collecting payments in the app. Card reader connections are more stable. And we fixed an issue where your store's analytics are sometimes not updated. 
+
+
 ## 10.2
 Even though this release doesn’t have any new features, we still put a lot of love into it! You can now enable or disable the option to take card or cash payments on collection or delivery. We also added a new Help Center page that makes it easier for you to login to the app.
 

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -7,10 +7,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         switch featureFlag {
         case .barcodeScanner:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .jetpackConnectionPackageSupport:
-            return true
-        case .couponView:
-            return true
         case .productSKUInputScanner:
             return true
         case .inbox:
@@ -19,20 +15,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .splitViewInOrdersTab:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .couponDeletion:
-            return true
-        case .couponEditing:
-            return true
-        case .couponCreation:
-            return true
         case .updateOrderOptimistically:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .backgroundProductImageUpload:
-            return true
-        case .appleIDAccountDeletion:
-            return true
         case .newToWooCommerceLinkInLoginPrologue:
             return true
         case .loginPrologueOnboarding:

Experiments/Experiments/FeatureFlag.swift

@@ -14,14 +14,6 @@ public enum FeatureFlag: Int {
     ///
     case reviews
 
-    /// Allows sites with plugins that include Jetpack Connection Package and without Jetpack-the-plugin to connect to the app
-    ///
-    case jetpackConnectionPackageSupport
-
-    /// Displays the option to view coupons
-    ///
-    case couponView
-
     /// Barcode scanner for product SKU input
     ///
     case productSKUInputScanner
@@ -38,18 +30,6 @@ public enum FeatureFlag: Int {
     ///
     case splitViewInOrdersTab
 
-    /// Displays the option to delete coupons
-    ///
-    case couponDeletion
-
-    /// Displays the option to edit a coupon
-    ///
-    case couponEditing
-
-    /// Displays the option to create a coupon
-    ///
-    case couponCreation
-
     /// Enable optimistic updates for orders
     ///
     case updateOrderOptimistically
@@ -58,18 +38,10 @@ public enum FeatureFlag: Int {
     ///
     case shippingLabelsOnboardingM1
 
-    /// Enable image upload after leaving the product form
-    ///
-    case backgroundProductImageUpload
-
     /// Enable IPP reader manuals consolidation screen
     ///
     case consolidatedCardReaderManuals
 
-    /// Apple ID account deletion
-    ///
-    case appleIDAccountDeletion
-
     /// Showing a "New to WooCommerce" link in the login prologue screen
     ///
     case newToWooCommerceLinkInLoginPrologue