Merge branch 'trunk' into pos-orders-fix-status-bar-handling

Author: samiuelson

.buildkite/commands/prototype-build-fad.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -eu
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :mag: Retrieving app selection from metadata"
+APP_TO_BUILD="$(buildkite-agent meta-data get "app-to-build")"
+echo "Selected app: ${APP_TO_BUILD}"
+
+echo "--- :hammer_and_wrench: Building and uploading to Firebase App Distribution"
+bundle exec fastlane build_and_upload_prototype_build_fad app:"${APP_TO_BUILD}"
+

.buildkite/pipeline.yml

@@ -118,3 +118,32 @@ steps:
   - label: "🐘 Populate Gradle build cache"
     command: .buildkite/commands/gradle-cache-build.sh
     plugins: [$CI_TOOLKIT]
+
+  ########################################
+  # Optional Prototype Builds for trunk branch, distributed via Firebase App Distribution (FAD)
+  ########################################
+  - group: "🚀 Prototype Build"
+    if: "build.branch == 'trunk'"
+    steps:
+      - block: ":rocket: Build Prototype and distribute via Firebase"
+        prompt: Select which app to build and distribute via Firebase App Distribution
+        key: prototype_builds_fad_triggered
+        fields:
+          - select: "App to Build"
+            key: "app-to-build"
+            hint: "Which WooCommerce app should be built? 📱"
+            required: true
+            default: "WooCommerce"
+            options:
+              - label: "📱 WooCommerce Mobile"
+                value: "WooCommerce"
+              - label: "⌚️ WooCommerce Wear"
+                value: "WooCommerce-Wear"
+      - label: ":firebase: Prototype Build (FAD)"
+        depends_on: prototype_builds_fad_triggered
+        command: |
+          ".buildkite/commands/prototype-build-fad.sh"
+        plugins: [$CI_TOOLKIT]
+        artifact_paths:
+          - "WooCommerce/build/outputs/apk/**/*"
+          - "WooCommerce-Wear/build/outputs/apk/**/*"

.buildkite/release-pipelines/new-hotfix-release.yml

@@ -2,11 +2,6 @@
 ---
 
 steps:
-  - block: "What version code do you want to use for the new hotfix release?"
-    fields:
-      - text: "Version Code"
-        key: "version_code"
-        format: "[0-9]+" # Only allow numbers
   - label: "New Hotfix Release"
     plugins: [$CI_TOOLKIT]
     command: |
@@ -16,12 +11,8 @@ steps:
       echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
-      # Get the version code from the Buildkite 'block' step
-      VERSION_CODE=$(buildkite-agent meta-data get version_code)
-
       echo '--- :fire: Start New Hotfix Release'
-      # Note: we need to double the dollar sign in front of `{VERSION_CODE}` below, so that the env var is interpreted *at runtime*, instead of too soon during `pipeline upload`
-      bundle exec fastlane new_hotfix_release version_name:$${VERSION} version_code:$${VERSION_CODE} skip_confirm:true
+      bundle exec fastlane new_hotfix_release version_name:"$RELEASE_VERSION" version_code:"$VERSION_CODE" skip_confirm:true
     agents:
         queue: "tumblr-metal"
     retry:

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.8
+This update smooths your workflow with fixes to back navigation, shipping rate crashes, and payment screen layout. POS also gets improvements, including faster Local Catalog settings, better handling of deleted products, and automatic scrolling to your newest orders.
+
 ## 23.7
 Selling in-person just got faster! We've supercharged Woo POS with lightning-fast product search, instant barcode scanning, and near-instant loading. Your in-store experience is now smoother than ever.
 

Gemfile

@@ -4,12 +4,13 @@ source 'https://rubygems.org'
 
 gem 'danger-dangermattic', '~> 1.2'
 gem 'fastlane', '~> 2.216'
+gem 'fastlane-plugin-firebase_app_distribution', '~> 0.10'
 gem 'nokogiri'
 gem 'rubocop', '~> 1.65'
 
 ### Fastlane Plugins
 
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.5'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.7'
 # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
 

Gemfile.lock

@@ -5,21 +5,21 @@ 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)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     ast (2.4.3)
     atomos (0.1.3)
@@ -44,7 +44,6 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
-    benchmark (0.4.1)
     bigdecimal (3.3.0)
     buildkit (1.6.1)
       sawyer (>= 0.6)
@@ -59,24 +58,24 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (2.5.5)
     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.2)
+      terminal-table (>= 1, < 5)
+    danger-dangermattic (1.2.4)
       danger (~> 9.4)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.13)
@@ -168,7 +167,10 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-wpmreleasetoolkit (13.5.1)
+    fastlane-plugin-firebase_app_distribution (0.10.1)
+      google-apis-firebaseappdistribution_v1 (~> 0.3.0)
+      google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
+    fastlane-plugin-wpmreleasetoolkit (13.7.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -201,6 +203,10 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
+    google-apis-firebaseappdistribution_v1 (0.3.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-firebaseappdistribution_v1alpha (0.2.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
@@ -236,20 +242,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.4)
+    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.2)
     multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
@@ -268,23 +274,23 @@ GEM
     optparse (0.6.0)
     os (1.1.4)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.2)
-    prism (1.4.0)
+    prism (1.6.0)
     progress_bar (1.3.4)
       highline (>= 1.6)
       options (~> 2.3.0)
     pstore (0.2.0)
-    public_suffix (6.0.2)
+    public_suffix (7.0.0)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
     rake-compiler (1.3.0)
       rake
     rchardet (1.10.0)
-    regexp_parser (2.10.0)
+    regexp_parser (2.11.3)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -293,24 +299,24 @@ GEM
     rexml (3.4.4)
     rmagick (4.3.0)
     rouge (3.28.0)
-    rubocop (1.75.4)
+    rubocop (1.81.7)
       json (~> 2.3)
       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.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     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)
@@ -336,7 +342,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)
     xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -356,7 +362,8 @@ PLATFORMS
 DEPENDENCIES
   danger-dangermattic (~> 1.2)
   fastlane (~> 2.216)
-  fastlane-plugin-wpmreleasetoolkit (~> 13.5)
+  fastlane-plugin-firebase_app_distribution (~> 0.10)
+  fastlane-plugin-wpmreleasetoolkit (~> 13.7)
   nokogiri
   rmagick (~> 4.1)
   rubocop (~> 1.65)

RELEASE-NOTES.txt

@@ -2,6 +2,10 @@
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 
+23.9
+-----
+
+
 23.8
 -----
 - [*] Fixed system back button not working on Order Creation screen [https://github.com/woocommerce/woocommerce-android/pull/15016]
@@ -10,6 +14,7 @@
 - [*][Woo POS] Fixed payment screen layout to properly position payment instructions text [https://github.com/woocommerce/woocommerce-android/pull/14991]
 - [*][Woo POS] Automatically scroll to newly created orders when returning to the Orders screen [https://github.com/woocommerce/woocommerce-android/pull/14990]
 - [Internal] Restore coupon drawable files mistakenly removed in previous release [https://github.com/woocommerce/woocommerce-android/pull/15005]
+- [*] Fixed a rare crash that occurred when displaying shipping rates for a selected package [https://github.com/woocommerce/woocommerce-android/pull/15032]
 
 23.7
 -----

WooCommerce/src/main/kotlin/com/woocommerce/android/model/OrderShipmentTracking.kt

@@ -2,11 +2,12 @@ package com.woocommerce.android.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
 
 @Parcelize
 data class OrderShipmentTracking(
-    val id: Int = 0,
     val localSiteId: Int = 0,
     val orderId: Long = 0,
     val remoteTrackingId: String = "",
@@ -16,26 +17,25 @@ data class OrderShipmentTracking(
     val dateShipped: String,
     val isCustomProvider: Boolean = false
 ) : Parcelable {
-    fun toDataModel() = WCOrderShipmentTrackingModel().also { orderShipmentTrackingModel ->
-        orderShipmentTrackingModel.id = this.id
-        orderShipmentTrackingModel.orderId = this.orderId
-        orderShipmentTrackingModel.localSiteId = this.localSiteId
-        orderShipmentTrackingModel.remoteTrackingId = this.remoteTrackingId
-        orderShipmentTrackingModel.trackingNumber = this.trackingNumber
-        orderShipmentTrackingModel.dateShipped = this.dateShipped
-        orderShipmentTrackingModel.trackingProvider = this.trackingProvider
-    }
+    fun toDataModel() = WCOrderShipmentTrackingModel(
+        localSiteId = LocalId(this.localSiteId),
+        orderId = RemoteId(this.orderId),
+        remoteTrackingId = this.remoteTrackingId,
+        trackingNumber = this.trackingNumber,
+        trackingProvider = this.trackingProvider,
+        trackingLink = this.trackingLink,
+        dateShipped = this.dateShipped
+    )
 }
 
 fun WCOrderShipmentTrackingModel.toAppModel(): OrderShipmentTracking {
     return OrderShipmentTracking(
-        id,
-        localSiteId,
-        orderId,
-        remoteTrackingId,
-        trackingNumber,
-        trackingProvider,
-        trackingLink,
-        dateShipped
+        localSiteId = localSiteId.value,
+        orderId = orderId.value,
+        remoteTrackingId = remoteTrackingId,
+        trackingNumber = trackingNumber,
+        trackingProvider = trackingProvider,
+        trackingLink = trackingLink,
+        dateShipped = dateShipped
     )
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/model/ShippingLabelMapper.kt

@@ -7,7 +7,7 @@ import javax.inject.Inject
 class ShippingLabelMapper @Inject constructor(private val addressMapper: ShippingLabelAddressMapper) {
     fun toAppModel(databaseEntity: WCShippingLabelModel): ShippingLabel {
         return ShippingLabel(
-            id = databaseEntity.remoteShippingLabelId,
+            id = databaseEntity.remoteShippingLabelId.value,
             trackingNumber = databaseEntity.trackingNumber,
             carrierId = databaseEntity.carrierId,
             serviceName = databaseEntity.serviceName,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingsRepository.kt

@@ -24,7 +24,7 @@ class BookingsRepository @Inject constructor(
         page: Int,
         perPage: Int,
         query: String? = null,
-        filters: BookingFilters? = null,
+        filters: BookingFilters = BookingFilters.EMPTY,
         order: BookingsOrderOption
     ): Result<FetchResult> {
         val result = bookingsStore.fetchBookings(