Merge branch 'trunk' into woomob-1393-booking-list-search

Author: itsmeichigo

.buildkite/release-pipelines/start-code-freeze.yml

@@ -21,7 +21,7 @@ steps:
       bundle exec fastlane run configure_apply
 
       echo '--- :snowflake: Start Code Freeze'
-      bundle exec fastlane start_code_freeze skip_confirm:true
+      bundle exec fastlane start_code_freeze version:"${RELEASE_VERSION}" skip_confirm:true
     retry:
       manual:
         # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite

.bundle/config

@@ -3,4 +3,5 @@ BUNDLE_RETRY: "3"
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_JOBS: "16"
 BUNDLE_SPECIFIC_PLATFORM: "false"
+BUNDLE_FORCE_RUBY_PLATFORM: "true"
 BUNDLE_WITHOUT: "screenshots"

Gemfile

@@ -8,18 +8,11 @@ end
 
 gem 'danger-dangermattic', '~> 1.2'
 gem 'dotenv'
-# 2.217.0 includes a fix for Xcode 15 test results parsing in CI
 gem 'fastlane', '~> 2.228'
 gem 'fastlane-plugin-firebase_app_distribution', '~> 0.10'
 gem 'fastlane-plugin-sentry', '~> 1.0'
-# This comment avoids typing to switch to a development version for testing.
-#
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: '[email protected]:wordpress-mobile/release-toolkit', branch: ''
-#
-# The '>= 13.3.1' aftre '~> 13.3' ensures that we resolve to any version compatible with 13.3 starting from 13.3.1
-# Using '~> 13.3.1' would constrain us to 13.3.2, 13.3.3, etc. without ever going up to 13.4
-# We need 13.3.1 because of a fix in screenshots generation we depend upon.
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.3', '>= 13.3.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.5'
 gem 'rake', '~> 12.3'
 gem 'rubocop', '~> 1.65'
 gem 'rubocop-rake', '~> 0.6'

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (8.0.2)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -24,19 +24,19 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1154.0)
-    aws-sdk-core (3.232.0)
+    aws-partitions (1.1169.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.112.0)
+    aws-sdk-kms (1.113.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.198.0)
+    aws-sdk-s3 (1.199.1)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -45,7 +45,7 @@ GEM
     babosa (1.0.4)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.3.0)
     buildkit (1.6.1)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -59,7 +59,7 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     cork (0.3.0)
       colored2 (~> 3.1)
     danger (9.5.1)
@@ -173,7 +173,7 @@ GEM
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     fastlane-plugin-sentry (1.25.1)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (13.3.1)
+    fastlane-plugin-wpmreleasetoolkit (13.5.1)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -245,7 +245,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.13.2)
+    json (2.15.1)
     jwt (2.10.2)
       base64
     kramdown (2.5.1)
@@ -257,27 +257,25 @@ GEM
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.25.5)
+    minitest (5.26.0)
     multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.3.0)
     nkf (0.2.0)
-    nokogiri (1.18.8)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
-      racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
     options (2.3.2)
     optparse (0.6.0)
     os (1.1.4)
-    parallel (1.26.3)
+    parallel (1.27.0)
     parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
@@ -292,14 +290,14 @@ GEM
     rake (12.3.3)
     rake-compiler (1.3.0)
       rake
-    rchardet (1.8.0)
+    rchardet (1.10.0)
     regexp_parser (2.9.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.2)
+    rexml (3.4.4)
     rmagick (4.3.0)
     rouge (3.28.0)
     rubocop (1.68.0)
@@ -345,7 +343,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
-    uri (1.0.3)
+    uri (1.0.4)
     word_wrap (1.0.0)
     xcode-install (2.8.1)
       claide (>= 0.9.1)
@@ -364,17 +362,14 @@ GEM
 
 PLATFORMS
   ruby
-  x86_64-darwin-19
-  x86_64-darwin-20
-  x86_64-darwin-21
 
 DEPENDENCIES
   danger-dangermattic (~> 1.2)
   dotenv
   fastlane (~> 2.228)
   fastlane-plugin-firebase_app_distribution (~> 0.10)
   fastlane-plugin-sentry (~> 1.0)
-  fastlane-plugin-wpmreleasetoolkit (~> 13.3, >= 13.3.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 13.5)
   rake (~> 12.3)
   rmagick (~> 4.1)
   rubocop (~> 1.65)

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -90,16 +90,16 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pointOfSaleOrdersi2:
             return true
-        case .pointOfSaleSettingsi1:
-            return true
         case .orderAddressMapSearch:
             return true
         case .pointOfSaleHistoricalOrdersi1:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .pointOfSaleLocalCatalogi1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .ciabBookings:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .pointOfSaleSurveys:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -187,10 +187,6 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleOrdersi2
 
-    /// Enables the entry point for Point of Sale Settings
-    ///
-    case pointOfSaleSettingsi1
-
     /// Enables the CTA to search for an address in the map in order details > shipping address.
     ///
     case orderAddressMapSearch
@@ -207,4 +203,8 @@ public enum FeatureFlag: Int {
     /// Enables a new Bookings tab for CIAB sites
     ///
     case ciabBookings
+
+    /// Enables surveys for potential and current POS merchants
+    ///
+    case pointOfSaleSurveys
 }

Modules/Sources/NetworkingCore/Model/SalesChannel.swift

@@ -2,13 +2,19 @@ import Foundation
 
 public enum SalesChannel {
     case pointOfSale
+    case webCheckout
+    case wpAdmin
 }
 
 extension SalesChannel: RawRepresentable {
     public init?(rawValue: String) {
         switch rawValue {
         case "pos-rest-api":
             self = .pointOfSale
+        case "checkout", "store-api":
+            self = .webCheckout
+        case "admin":
+            self = .wpAdmin
         default:
             return nil
         }
@@ -18,6 +24,10 @@ extension SalesChannel: RawRepresentable {
         switch self {
         case .pointOfSale:
             return description
+        case .webCheckout:
+            return description
+        case .wpAdmin:
+            return description
         }
     }
 
@@ -27,6 +37,14 @@ extension SalesChannel: RawRepresentable {
             return NSLocalizedString("salesChannel.pos.description",
                                      value: "POS",
                                      comment: "The acronym for 'Point of Sale'.")
+        case .webCheckout:
+            return NSLocalizedString("salesChannel.webCheckout.description",
+                                     value: "Web Checkout",
+                                     comment: "Orders created through web checkout.")
+        case .wpAdmin:
+            return NSLocalizedString("salesChannel.wpAdmin.description",
+                                     value: "WP-Admin",
+                                     comment: "Orders created through WordPress admin interface.")
         }
     }
 }

Modules/Sources/PointOfSale/Colors/Color+POSColorPalette.swift

@@ -46,6 +46,12 @@ extension Color {
     static var posOnSuccess: Color { Color("posOnSuccess", bundle: .module) }
     static var posAlert: Color { Color("posAlert", bundle: .module) }
     static var posOnAlert: Color { Color("posOnAlert", bundle: .module) }
+    static var posErrorLowest: Color { Color("posErrorLowest", bundle: .module) }
+    static var posOnErrorLowest: Color { Color("posOnErrorLowest", bundle: .module) }
+    static var posInfoLowest: Color { Color("posInfoLowest", bundle: .module) }
+    static var posOnInfoLowest: Color { Color("posOnInfoLowest", bundle: .module) }
+    static var posDefault: Color { Color("posDefault", bundle: .module) }
+    static var posOnDefault: Color { Color("posOnDefault", bundle: .module) }
 
     // MARK: - Other
     static var posShadow: Color { Color("posShadow", bundle: .module) }

Modules/Sources/PointOfSale/Colors/POSColorPalette.xcassets/posDefault.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xDE",
+          "green" : "0xDC",
+          "red" : "0xDC"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/Sources/PointOfSale/Colors/POSColorPalette.xcassets/posErrorLowest.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xEC",
+          "green" : "0xEB",
+          "red" : "0xF7"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xAF",
+          "green" : "0xAB",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}