Merge branch 'trunk' into replace-clear-button-with-icon

Author: joshheald

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 22.7
+Say hello to smoother shipping and sales! 🎉 We’ve enhanced Shipping Labels with UPS extras and smarter forms, fixed price and display glitches, and made shipment management easier. Plus, Point of Sale now has its own tab for eligible stores, barcode scanning, and smoother product refresh for faster checkout.
+
 ## 22.6
 Shipping just got a major upgrade! Our revamped flow makes it easier than ever to create and manage shipping labels for stores using WooCommerce Shipping. We've also improved some icons and fixed a display issue with the order list's last updated time. This release includes some behind-the-scenes performance improvements too.
 

Gemfile

@@ -15,7 +15,11 @@ 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: ''
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.0'
+#
+# 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 'rake', '~> 12.3'
 gem 'rubocop', '~> 1.65'
 gem 'rubocop-rake', '~> 0.6'

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.2.1)
+    activesupport (8.0.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -17,6 +17,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
@@ -40,8 +41,8 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     buildkit (1.6.1)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -54,8 +55,8 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     cork (0.3.0)
       colored2 (~> 3.1)
     danger (9.5.1)
@@ -83,12 +84,12 @@ GEM
       danger
       rubocop (~> 1.0)
     declarative (0.0.20)
-    diffy (3.4.3)
+    diffy (3.4.4)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
-    drb (2.2.1)
+    drb (2.2.3)
     emoji_regex (3.2.3)
     excon (0.112.0)
     faraday (1.10.4)
@@ -169,7 +170,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.0.0)
+    fastlane-plugin-wpmreleasetoolkit (13.3.1)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -236,7 +237,7 @@ GEM
     http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
@@ -248,21 +249,21 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    logger (1.6.4)
+    logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.4)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    nokogiri (1.18.3)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -284,7 +285,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (12.3.3)
-    rake-compiler (1.2.9)
+    rake-compiler (1.3.0)
       rake
     rchardet (1.8.0)
     regexp_parser (2.9.2)
@@ -339,6 +340,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
+    uri (1.0.3)
     word_wrap (1.0.0)
     xcode-install (2.8.1)
       claide (>= 0.9.1)
@@ -367,7 +369,7 @@ DEPENDENCIES
   fastlane (~> 2.217)
   fastlane-plugin-firebase_app_distribution (~> 0.10)
   fastlane-plugin-sentry (~> 1.0)
-  fastlane-plugin-wpmreleasetoolkit (~> 13.0)
+  fastlane-plugin-wpmreleasetoolkit (~> 13.3, >= 13.3.1)
   rake (~> 12.3)
   rmagick (~> 4.1)
   rubocop (~> 1.65)

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -93,6 +93,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return false
         case .pointOfSaleAsATabi1:
             return true
+        case .pointOfSaleOrdersi1:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -195,4 +195,8 @@ public enum FeatureFlag: Int {
     /// Enables displaying POS as a tab in the tab bar with the same eligibility as the previous entry point
     ///
     case pointOfSaleAsATabi1
+
+    /// Enables displaying Point Of Sale details in order list and order details
+    ///
+    case pointOfSaleOrdersi1
 }

Modules/Sources/Networking/Model/ShippingLabel/Packages/CarriersAndRates/ShippingLabelPackageSelected.swift

@@ -46,7 +46,10 @@ extension ShippingLabelPackageSelected: Encodable {
         try container.encode(boxID.isEmpty ? "0" : boxID, forKey: .boxID)
         try container.encode(length, forKey: .length)
         try container.encode(width, forKey: .width)
-        try container.encode(height, forKey: .height)
+
+        // workaround because 0 would cause an error for the API request
+        try container.encode(height > 0 ? height : 0.25, forKey: .height)
+
         try container.encode(weight, forKey: .weight)
         try container.encode(isLetter, forKey: .isLetter)
         try container.encodeIfPresent(hazmatCategory, forKey: .hazmatCategory)

Modules/Sources/Networking/Model/ShippingLabel/Packages/PredefinedPackage/WooShippingPredefinedPackage.swift

@@ -38,7 +38,7 @@ public struct WooShippingPredefinedPackage: Equatable, GeneratedFakeable, Identi
     }
 
     public func getLength() -> Double {
-        let firstComponent = dimensions.components(separatedBy: " x ").first ?? ""
+        let firstComponent = dimensions.components(separatedBy: " x ")[safe: 0] ?? ""
         return Double(firstComponent) ?? 0
     }
 
@@ -48,7 +48,7 @@ public struct WooShippingPredefinedPackage: Equatable, GeneratedFakeable, Identi
     }
 
     public func getHeight() -> Double {
-        let lastComponent = dimensions.components(separatedBy: " x ").last ?? ""
+        let lastComponent = dimensions.components(separatedBy: " x ")[safe: 2] ?? ""
         return Double(lastComponent) ?? 0
     }
 }

Modules/Sources/Storage/Model/MIGRATIONS.md

@@ -2,6 +2,10 @@
 
 This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
 
+## Model 123 (Release 22.8.0.0)
+- @iamgabrielma 2025-06-30
+    - Added `createdVia` attribute to `Order` entity. 
+
 ## Model 122 (Release 22.7.0.0)
 - @itsmeichigo 2025-06-20
     - Added `shipmentID` attribute to `ShippingLabel` entity.

Modules/Sources/Storage/Model/Order+CoreDataProperties.swift

@@ -20,6 +20,7 @@ extension Order {
     @NSManaged public var billingPostcode: String?
     @NSManaged public var billingState: String?
     @NSManaged public var chargeID: String?
+    @NSManaged public var createdVia: String?
     @NSManaged public var currency: String?
     @NSManaged public var customerID: Int64
     @NSManaged public var customerNote: String?

Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model 122.xcdatamodel</string>
+	<string>Model 123.xcdatamodel</string>
 </dict>
 </plist>