Merge branch 'trunk' into issue/WOOMOB-1126-app-passwords-network

# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

Author: hichamboushaba

.github/dependabot.yml

@@ -15,6 +15,9 @@ updates:
           - "com.google.devtools.ksp*"
         exclude-patterns:
           - "org.jetbrains.kotlinx*"
+    cooldown:
+      semver-major-days: 30
+      semver-minor-days: 30
     ignore:
       # Bumping 2.26.3 to 2.27.2 will break the mocks. For more details, see
       # https://github.com/wiremock/wiremock/issues/1345#issuecomment-656060968

.github/workflows/dependabot_automerge.yml

@@ -0,0 +1,55 @@
+name: Auto-merge Dependabot PATCH updates
+
+on:
+  pull_request:
+    types: [opened, reopened]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'woocommerce/woocommerce-android'
+    env:
+      PR_URL: ${{ github.event.pull_request.html_url }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Fetch Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Assign closest open milestone to PR
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: |
+          set -e
+          title=$(gh api repos/$GITHUB_REPOSITORY/milestones \
+            --jq '[.[]
+              | select(.state=="open" and .due_on!=null and (.due_on | fromdateiso8601) >= now)
+            ]
+            | sort_by(.due_on)
+            | .[0].title')
+
+          if [ -n "$title" ]; then
+            echo "Assigning milestone '$title' to PR #${{ github.event.pull_request.number }}"
+            gh pr edit "${{ github.event.pull_request.number }}" --milestone "$title"
+          else
+            echo "No future open milestones found."
+          fi
+
+      - name: Approve the PR
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: |
+          set -e
+          gh pr review --approve "$PR_URL"
+
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: |
+          set -e
+          gh pr merge --auto --merge "$PR_URL"

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.2
+We’ve improved your WooCommerce app with new POS customization settings, clearer shipping label updates, smarter order filters, and automatic shipment weight entry. You’ll also find better handling of in-progress labels, fractional stock display, and enhanced login reliability for a smoother store management experience.
+
 ## 23.1
 Enhanced your store management experience with exciting new features! Remove backgrounds from product images instantly with our new one-tap tool. Improved shipping labels with better address validation, cleaner layouts, and smarter split shipment handling. Fixed order selection issues and enhanced login error handling for smoother operations.
 

RELEASE-NOTES.txt

@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** 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.3
+-----
+
+
 23.2
 -----
 - [Internal] Propagate response headers to all Rest Clients [https://github.com/woocommerce/woocommerce-android/pull/14513]
@@ -12,7 +16,9 @@
 - [WEAR] Updated UserAgent of API requests to use `http.agent` System Property to fix performance issues related to WebView usage on app launch [https://github.com/woocommerce/woocommerce-android/pull/14431]
 - [***] POS: A new settings to customize the POS [https://github.com/woocommerce/woocommerce-android/pull/14527]
 - [*] [Login] Improved the detection of WooCommerce API version during login flow [https://github.com/woocommerce/woocommerce-android/pull/14524]
+- [*]  Add more filter options to orders filters sales channel [https://github.com/woocommerce/woocommerce-android/pull/14546]
 - [*] Automatically populate the weight field in the create shipment flow [https://github.com/woocommerce/woocommerce-android/pull/14525]
+- [*] [Shipping Labels] Fixed displaying incorrect hazardous material option for purchased labels [https://github.com/woocommerce/woocommerce-android/pull/14571]
 
 23.1
 -----

WooCommerce/build.gradle

@@ -19,7 +19,9 @@ fladle {
     variant = "vanillaDebug"
     serviceAccountCredentials = rootProject.file(".configure-files/firebase.secrets.json")
     testTargets = [
-            "notPackage com.woocommerce.android.e2e.tests.screenshot"
+            "notPackage com.woocommerce.android.e2e.tests.screenshot",
+            "notClass com.woocommerce.android.e2e.tests.ui.OrdersRealAPI",
+            "notClass com.woocommerce.android.e2e.tests.ui.ProductsRealAPI"
     ]
     devices = [
             ["model": "MediumPhone.arm", "version": "35"]

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

@@ -78,6 +78,7 @@ object AppPrefs {
         LOGIN_SITE_ADDRESS,
         DATABASE_DOWNGRADED,
         ORDER_SUMMARY_MIGRATED,
+        GATEWAY_MIGRATED,
         IS_PRODUCTS_FEATURE_ENABLED,
         IS_PRODUCT_ADDONS_ENABLED,
         LOGIN_USER_BYPASSED_JETPACK_REQUIRED,
@@ -297,6 +298,10 @@ object AppPrefs {
         get() = getBoolean(DeletablePrefKey.ORDER_SUMMARY_MIGRATED, false)
         set(value) = setBoolean(DeletablePrefKey.ORDER_SUMMARY_MIGRATED, value)
 
+    var gatewayMigrated: Boolean
+        get() = getBoolean(DeletablePrefKey.GATEWAY_MIGRATED, false)
+        set(value) = setBoolean(DeletablePrefKey.GATEWAY_MIGRATED, value)
+
     var jetpackAppPasswordsEnabled: Boolean
         get() = getBoolean(DeletablePrefKey.JETPACK_APP_PASSWORDS_ENABLED, true)
         set(value) = setBoolean(DeletablePrefKey.JETPACK_APP_PASSWORDS_ENABLED, value)

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefsWrapper.kt

@@ -40,6 +40,7 @@ open class AppPrefsWrapper @Inject constructor() {
     var isSiteWPComSuspended by AppPrefs::isSiteWPComSuspended
 
     open var orderSummaryMigrated by AppPrefs::orderSummaryMigrated
+    open var gatewayMigrated by AppPrefs::gatewayMigrated
 
     var jetpackAppPasswordsEnabled by AppPrefs::jetpackAppPasswordsEnabled
 

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

@@ -1,6 +1,7 @@
 package com.woocommerce.android.model
 
 import android.os.Parcelable
+import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHazmatCategory
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShippingLabelModel
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShippingLabelStatus
 import kotlinx.parcelize.IgnoredOnParcel
@@ -25,6 +26,7 @@ data class ShippingLabel(
     val currency: String = "",
     val productNames: List<String> = emptyList(),
     val productIds: List<Long> = emptyList(),
+    val hazmatCategory: ShippingLabelHazmatCategory? = null,
     val originAddress: Address? = null,
     val destinationAddress: Address? = null,
     val refund: Refund? = null,
@@ -96,6 +98,7 @@ fun ShippingLabel.toShippingLabelModel(): ShippingLabelModel {
         usedDate = null,
         refund = refund?.let { ShippingLabelModel.Refund(status = it.status, requestDate = it.refundDate) },
         products = products,
+        hazmatCategory = hazmatCategory,
         originAddress = originAddress,
         destinationAddress = destinationAddress
     )

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesViewModel.kt

@@ -16,6 +16,7 @@ import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.DA
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.ORDER_STATUS
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.PRODUCT
 import com.woocommerce.android.ui.orders.filters.data.OrderListFilterCategory.SALES_CHANNEL
+import com.woocommerce.android.ui.orders.filters.data.SalesChannel
 import com.woocommerce.android.ui.orders.filters.domain.GetDateRangeFilterOptions
 import com.woocommerce.android.ui.orders.filters.domain.GetOrderStatusFilterOptions
 import com.woocommerce.android.ui.orders.filters.domain.GetTrackingForFilterSelection
@@ -390,9 +391,19 @@ class OrderFilterCategoriesViewModel @Inject constructor(
 
         return mutableListOf(
             OrderFilterOptionUiModel(
-                key = "pos",
+                key = SalesChannel.POS.key,
                 displayName = resourceProvider.getString(R.string.point_of_sale),
-                isSelected = currentSelection.contains("pos")
+                isSelected = currentSelection.contains(SalesChannel.POS.key)
+            ),
+            OrderFilterOptionUiModel(
+                key = SalesChannel.WEB_CHECKOUT.key,
+                displayName = resourceProvider.getString(R.string.orderfilters_sales_channel_filter_web_checkout),
+                isSelected = currentSelection.contains(SalesChannel.WEB_CHECKOUT.key)
+            ),
+            OrderFilterOptionUiModel(
+                key = SalesChannel.WP_ADMIN.key,
+                displayName = resourceProvider.getString(R.string.orderfilters_sales_channel_filter_wp_admin),
+                isSelected = currentSelection.contains(SalesChannel.WP_ADMIN.key)
             )
         ).apply {
             addFilterOptionAll(resourceProvider)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/data/OrderFilterDataModels.kt

@@ -8,6 +8,16 @@ enum class OrderListFilterCategory {
     SALES_CHANNEL
 }
 
+enum class SalesChannel(val key: String, val apiValue: String) {
+    POS("pos", "pos-rest-api"),
+    WEB_CHECKOUT("checkout", "checkout"),
+    WP_ADMIN("admin", "admin");
+
+    companion object {
+        fun fromKey(key: String): SalesChannel? = entries.find { it.key == key }
+    }
+}
+
 enum class DateRange(val filterKey: String) {
     TODAY("Today"),
     LAST_2_DAYS("Last2Days"),