Merge branch 'trunk' into feat/10428-existing-bundled-item-and-quanti…

…ty-rules

* trunk: (191 commits)
  Update WooCommerce/WooCommerceTests/ViewRelated/LedgerTableViewCellTests.swift
  Update WooCommerce/Classes/ViewRelated/ReusableViews/LedgerTableViewCell.swift
  Update WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomAmounts/OrderCustomAmountsSection.swift
  Move track event to viewmodel. Add tests
  Separate add-edit track events to separate methods
  Update test
  Track tap on add and edit discount
  Update “Add” discount event button
  update release notes
  Refactor totalPriceAfterDiscountLabel
  Update CocoaPods
  Update Dangermattic gem
  Move Dangerfile to project root, per Danger standard
  Update how activesupport version is locked
  Improve Dangerfile code
  Use DANGER_GITHUB_API_TOKEN from CI env
  Fix Cocoapods Active Support issue (CocoaPods/CocoaPods#12081)
  Add initial Danger setup with Dangermattic
  11009 Add hiding of Set up button to 16.0 release
  Fix hound warning
  ...

# Conflicts:
#	WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/ProductRowViewModelTests.swift

.buildkite/cache-builder.yml

@@ -7,7 +7,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.18.2
+    - automattic/a8c-ci-toolkit#3.0.0
     - automattic/git-s3-cache#1.1.4:
         bucket: "a8c-repo-mirrors"
         # This is not necessarily the actual name of the repo or the GitHub organization

.buildkite/commands/danger-pr-check.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+bundle install
+
+echo "--- Running Danger: PR Check"
+bundle exec danger --fail-on-errors=true --remove-previous-comments --danger_id=pr-check

.buildkite/pipeline.yml

@@ -2,7 +2,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.18.2
+    - automattic/a8c-ci-toolkit#3.0.0
     - automattic/git-s3-cache#1.1.4:
         bucket: "a8c-repo-mirrors"
         # This is not necessarily the actual name of the repo or the GitHub organization
@@ -59,6 +59,20 @@ steps:
   #################
   - group: Linters
     steps:
+      - label: "☢️ Danger - PR Check"
+        command: .buildkite/commands/danger-pr-check.sh
+        plugins:
+          - docker#v5.8.0:
+              image: "public.ecr.aws/docker/library/ruby:3.2.2"
+              propagate-environment: true
+              environment:
+                - "DANGER_GITHUB_API_TOKEN"
+        if: "build.pull_request.id != null"
+        agents:
+          queue: "default"
+        retry:
+          manual:
+            permit_on_passed: true
       - label: "🧹 Lint Translations"
         command: "gplint /workdir/WooCommerce/Resources/AppStoreStrings.pot"
         plugins:

.buildkite/release-builds.yml

@@ -4,7 +4,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.18.2
+    - automattic/a8c-ci-toolkit#3.0.0
     - automattic/git-s3-cache#1.1.4:
         bucket: "a8c-repo-mirrors"
         # This is not necessarily the actual name of the repo or the GitHub organization

Dangerfile

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+def release_branch?
+  danger.github.branch_for_base.start_with?('release/') || danger.github.branch_for_base.start_with?('hotfix/')
+end
+
+def main_branch?
+  danger.github.branch_for_base == 'trunk'
+end
+
+def wip_feature?
+  has_wip_label = github.pr_labels.any? { |label| label.include?('WIP') }
+  has_wip_title = github.pr_title.include?('WIP')
+
+  has_wip_label || has_wip_title
+end
+
+return if github.pr_labels.include?('Releases')
+
+github.dismiss_out_of_range_messages
+
+manifest_pr_checker.check_all_manifest_lock_updated
+
+labels_checker.check(
+  do_not_merge_labels: ['status: do not merge'],
+  required_labels: [//],
+  required_labels_error: 'PR requires at least one label.'
+)
+
+view_changes_need_screenshots.view_changes_need_screenshots
+
+pr_size_checker.check_diff_size
+
+# skip check for draft PRs and for WIP features unless the PR is against the main branch or release branch
+milestone_checker.check_milestone_due_date(days_before_due: 2) if !github.pr_draft? && (!wip_feature? || (release_branch? || main_branch?))
+
+rubocop.lint(inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -99,13 +99,9 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .giftCardInOrderForm:
             return true
         case .wooPaymentsDepositsOverviewInPaymentsMenu:
-            return (buildConfig == .localDeveloper || buildConfig == .alpha) && !isUITesting
-        case .orderCustomAmountsM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .tapToPayOnIPhoneInUK:
             return true
-        case .optimizedBlazeExperience:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .productBundlesInOrderForm:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         default:

Experiments/Experiments/FeatureFlag.swift

@@ -214,14 +214,6 @@ public enum FeatureFlag: Int {
     /// 
     case tapToPayOnIPhoneInUK
 
-    /// Enables the functionality related to order custom amounts on M1
-    ///
-    case orderCustomAmountsM1
-
-    /// Enables a new section on the My Store screen and a new entry point to the campaign list.
-    ///
-    case optimizedBlazeExperience
-
     /// Enables bundle product configuration support in order creation/editing.
     ///
     case productBundlesInOrderForm

Gemfile

@@ -6,8 +6,7 @@ group :screenshots, optional: true do
   gem 'rmagick', '~> 4.1'
 end
 
-# 1.13.x and higher, but less than 2.x, starting from 1.13.0
-gem 'cocoapods', '~> 1.13', '>= 1.13.0'
+gem 'cocoapods', '~> 1.14'
 gem 'cocoapods-catalyst-support', '~> 0.1'
 gem 'dotenv'
 gem 'fastlane', '~> 2'
@@ -22,3 +21,5 @@ gem 'rubocop', '~> 1.56'
 gem 'rubocop-rake', '~> 0.6'
 gem 'xcode-install'
 gem 'xcpretty-travis-formatter'
+
+gem 'danger-dangermattic', git: 'https://github.com/Automattic/dangermattic'