Merge branch 'release/23.7' into merge/release-23.6.1-into-release-23.7

# Conflicts:
#	config/Version.Public.xcconfig

Author: RafaelKayumov

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.7
+This update brings Tap to Pay on iPhone to UK stores using Stripe, and automatic SSO sign-ins for web admin tasks. We made card payment onboarding error tips clearer, and fixed an intermittent bug with adding variations to an order. Lastly, iPad users can share quick feedback about Point of Sale.
+
 ## 23.6
 This update improves app stability and usability. We’ve enhanced compatibility for stores using HTTP site addresses, optimized how tabs load based on saved states, and fixed an issue that prevented dismissing the keyboard when editing product titles.
 

Gemfile.lock

@@ -5,14 +5,14 @@ GEM
       base64
       nkf
       rexml
-    activesupport (8.0.3)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -21,31 +21,30 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
-    ast (2.4.2)
+    ast (2.4.3)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1169.0)
-    aws-sdk-core (3.233.0)
+    aws-partitions (1.1181.0)
+    aws-sdk-core (3.237.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.113.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-kms (1.117.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.199.1)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-s3 (1.203.1)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.3.0)
+    bigdecimal (3.3.1)
     buildkit (1.6.1)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -62,21 +61,21 @@ GEM
     connection_pool (2.5.4)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.5.1)
+    danger (9.5.3)
       base64 (~> 0.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
+      colored2 (>= 3.1, < 5)
       cork (~> 0.1)
       faraday (>= 0.9.0, < 3.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.13)
-      kramdown (~> 2.3)
+      git (>= 1.13, < 3.0)
+      kramdown (>= 2.5.1, < 3.0)
       kramdown-parser-gfm (~> 1.0)
       octokit (>= 4.0)
       pstore (~> 0.1)
-      terminal-table (>= 1, < 4)
-    danger-dangermattic (1.2.1)
+      terminal-table (>= 1, < 5)
+    danger-dangermattic (1.2.4)
       danger (~> 9.4)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.13)
@@ -168,12 +167,12 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-firebase_app_distribution (0.10.0)
+    fastlane-plugin-firebase_app_distribution (0.10.1)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
-    fastlane-plugin-sentry (1.25.1)
+    fastlane-plugin-sentry (1.35.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (13.5.1)
+    fastlane-plugin-wpmreleasetoolkit (13.7.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -245,19 +244,20 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.15.1)
+    json (2.16.0)
     jwt (2.10.2)
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.0)
+    minitest (5.26.1)
     multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
@@ -273,25 +273,26 @@ GEM
       sawyer (~> 0.9)
     open4 (1.3.4)
     options (2.3.2)
-    optparse (0.6.0)
+    optparse (0.8.0)
     os (1.1.4)
     parallel (1.27.0)
-    parser (3.3.6.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.2)
+    prism (1.6.0)
     progress_bar (1.3.4)
       highline (>= 1.6)
       options (~> 2.3.0)
-    pstore (0.1.3)
+    pstore (0.2.0)
     public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (12.3.3)
     rake-compiler (1.3.0)
       rake
     rchardet (1.10.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.11.3)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -300,24 +301,27 @@ GEM
     rexml (3.4.4)
     rmagick (4.3.0)
     rouge (3.28.0)
-    rubocop (1.68.0)
+    rubocop (1.81.7)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.36.1)
-      parser (>= 3.3.1.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.48.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
-    sawyer (0.9.2)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
@@ -343,7 +347,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
-    uri (1.0.4)
+    uri (1.1.1)
     word_wrap (1.0.0)
     xcode-install (2.8.1)
       claide (>= 0.9.1)

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -101,9 +101,9 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .ciab:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleSurveys:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .pointOfSaleSettingsCardReaderFlow:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
+        case .pointOfSaleCatalogAPI:
+            return false
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -213,7 +213,7 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleSurveys
 
-    /// Enables card reader connection flow within POS settings
+    /// Enables using the catalog API endpoint for Point of Sale catalog full sync
     ///
-    case pointOfSaleSettingsCardReaderFlow
+    case pointOfSaleCatalogAPI
 }

Modules/Sources/Fakes/Networking.generated.swift

@@ -343,7 +343,8 @@ extension Networking.Booking {
             attendanceStatusKey: .fake(),
             localTimezone: .fake(),
             currency: .fake(),
-            orderInfo: .fake()
+            orderInfo: .fake(),
+            note: .fake()
         )
     }
 }
@@ -812,7 +813,8 @@ extension Networking.POSProduct {
             attributes: .fake(),
             manageStock: .fake(),
             stockQuantity: .fake(),
-            stockStatusKey: .fake()
+            stockStatusKey: .fake(),
+            variationIDs: .fake()
         )
     }
 }

Modules/Sources/Fakes/Yosemite.generated.swift

@@ -76,6 +76,15 @@ extension Yosemite.ProductReviewFromNoteParcel {
         )
     }
 }
+extension Yosemite.StoredBookingFilters {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Yosemite.StoredBookingFilters {
+        .init(
+            filters: .fake()
+        )
+    }
+}
 extension Yosemite.SystemInformation {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Networking/Model/Bookings/Booking.swift

@@ -24,6 +24,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
     public let localTimezone: String
     public let currency: String
     public let orderInfo: BookingOrderInfo?
+    public let note: String
 
     public var bookingStatus: BookingStatus {
         return BookingStatus(rawValue: statusKey) ?? .unknown
@@ -54,7 +55,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
                 attendanceStatusKey: String,
                 localTimezone: String,
                 currency: String,
-                orderInfo: BookingOrderInfo?) {
+                orderInfo: BookingOrderInfo?,
+                note: String) {
         self.siteID = siteID
         self.bookingID = bookingID
         self.allDay = allDay
@@ -75,6 +77,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         self.localTimezone = localTimezone
         self.currency = currency
         self.orderInfo = orderInfo
+        self.note = note
     }
 
     /// The public initializer for Booking.
@@ -129,6 +132,7 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
         let localTimezone = try container.decode(String.self, forKey: .localTimezone)
         let currency = try container.decode(String.self, forKey: .currency)
         let orderInfo: BookingOrderInfo? = nil // to be prefilled when synced
+        let note = try container.decode(String.self, forKey: .note)
 
         self.init(siteID: siteID,
                   bookingID: bookingID,
@@ -149,7 +153,8 @@ public struct Booking: Codable, GeneratedCopiable, Hashable, GeneratedFakeable {
                   attendanceStatusKey: attendanceStatusKey,
                   localTimezone: localTimezone,
                   currency: currency,
-                  orderInfo: orderInfo)
+                  orderInfo: orderInfo,
+                  note: note)
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -203,6 +208,7 @@ private extension Booking {
         case attendanceStatusKey = "attendance_status"
         case localTimezone = "local_timezone"
         case currency
+        case note
     }
 }
 
@@ -216,7 +222,7 @@ enum BookingDecodingError: Error {
 //
 
 /// Represents a Booking Status.
-public enum BookingStatus: String, CaseIterable {
+public enum BookingStatus: String, CaseIterable, Codable {
     case complete
     case paid
     case unpaid
@@ -226,10 +232,19 @@ public enum BookingStatus: String, CaseIterable {
     case unknown
 }
 
-public enum BookingAttendanceStatus: String, CaseIterable {
+public enum BookingAttendanceStatus: String, CaseIterable, Codable {
     case booked
     case checkedIn = "checked-in"
     case cancelled
     case noShow = "no-show"
     case unknown
 }
+
+/// Represents the payment status for a booking.
+/// To be decoded from booking response once available.
+public enum BookingPaymentStatus: String, CaseIterable, Codable {
+    case paid
+    case unpaid
+    case refunded
+    case unknown
+}