Merge branch 'trunk' into woomob-1128-woo-possettings-implement-analytics-events

# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartViewModel.kt
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/WooPosSettingsScreen.kt

Author: kidinov

.github/workflows/dependabot-constraintlayout-check.yml

@@ -0,0 +1,67 @@
+name: Dependabot POS Reminder
+
+on:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  add-pos-reminder:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+
+    steps:
+      # Check if PR contains the constraintlayout dependency
+      - name: Check for ConstraintLayout Compose dependency
+        id: check-dependency
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const title = context.payload.pull_request.title;
+            const body = context.payload.pull_request.body;
+            const searchTerm = 'androidx.constraintlayout:constraintlayout-compose';
+
+            const containsDependency =
+              title.includes(searchTerm) ||
+              body.includes(searchTerm);
+
+            console.log(`PR contains ${searchTerm}: ${containsDependency}`);
+            return containsDependency;
+          result-encoding: string
+
+      # Add comment if dependency is found
+      - name: Comment on PR
+        if: steps.check-dependency.outputs.result == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            // Check if comment already exists to avoid duplicates
+            const comments = await github.rest.issues.listComments({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
+
+            const botComment = comments.data.find(comment =>
+              comment.user.type === 'Bot' &&
+              comment.body.includes('POS testing')
+            );
+
+            if (!botComment) {
+              const commentBody = `## ⚠️ POS Testing Required
+
+              This PR updates \`androidx.constraintlayout:constraintlayout-compose\`, which affects the Point of Sale system.
+
+              **Required Testing:**
+              - [ ] Cart items remain visible during checkout
+              - [ ] Layout constraints work correctly on all screen sizes
+              - [ ] No UI elements disappear unexpectedly
+
+              Please complete POS testing before merging this PR.`;
+
+              await github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: commentBody
+              });
+            }

CHANGELOG.md

@@ -1,8 +1,11 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 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.
+
 ## 23.0
-Psst... Excuse me, do you have a moment to talk about Woo Point of Sale? 💰 It now takes center stage with a shiny new POS tab in the main navigation—one tap and you’re selling in the UK and US, with improved external barcode scanner support 📦 for smoother checkouts. We’ve also refreshed the UI with sleek Material 3 touches ✨ and packed in small improvements and fixes you’ll want to explore.
+Psst... Excuse me, do you have a moment to talk about Woo Point of Sale? It now takes center stage with a shiny new POS tab in the main navigation—one tap and you’re selling in the UK and US, with improved external barcode scanner support for smoother checkouts. We’ve also refreshed the UI with sleek Material 3 touches and packed in small improvements and fixes you’ll want to explore.
 
 ## 22.9
 We’ve enhanced your WooCommerce experience with exciting Point of Sale improvements! Now filter orders by POS sales channel, set up barcode readers seamlessly, and spot POS orders with new badges on your dashboard. We’ve also fixed loading issues in order details, resolved payment screen crashes, restored search functionality, and improved shipping label address validation. Plus better plugin detection and currency handling after app restarts.

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.2
+-----
+- [*] Shipping Labels: Add error message for invalid dimensions errors to custom package creation screen [https://github.com/woocommerce/woocommerce-android/pull/14499]
+
 23.1
 -----
 - [*] You can now remove background from product images in the app. Just open the product image and click "Remove background" button. [https://github.com/woocommerce/woocommerce-android/pull/14445]
@@ -14,6 +18,12 @@
 - [Internal] Migrate the cache of the `/config` endpoint to Room instead of DataStore [https://github.com/woocommerce/woocommerce-android/pull/14462]
 - [*] Improved error handling in login flow when the WP API is not reachable [https://github.com/woocommerce/woocommerce-android/pull/14472]
 - [*] Shipping Labels: Autofill the country field in the customs form and improve the form validation [https://github.com/woocommerce/woocommerce-android/pull/14469]
+- [*] Shipping Labels: Fix UI issues on edit address screen [https://github.com/woocommerce/woocommerce-android/pull/14476]
+- [Internal] 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]
+- [*] Shipping Labels: Improved handling of address validation errors [https://github.com/woocommerce/woocommerce-android/pull/14468]
+- [*] Shipping Labels: Update UI of the shipping labels details in Order Details screen [https://github.com/woocommerce/woocommerce-android/pull/14485]
+- [*] Shipping Labels: Improved the error message for empty shipping rates list [https://github.com/woocommerce/woocommerce-android/pull/14433]
+- [*] Shipping Labels: Update button logic on the Hazardous Materials screen [https://github.com/woocommerce/woocommerce-android/pull/14488]
 
 23.0
 -----

WooCommerce/proguard-rules.pro

@@ -79,6 +79,18 @@
 }
 ###### SavedStateHandleExt - end
 
+###### Google Crypto Tink dependencies - begin
+-dontwarn com.google.api.client.http.GenericUrl
+-dontwarn com.google.api.client.http.HttpHeaders
+-dontwarn com.google.api.client.http.HttpRequest
+-dontwarn com.google.api.client.http.HttpRequestFactory
+-dontwarn com.google.api.client.http.HttpResponse
+-dontwarn com.google.api.client.http.HttpTransport
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport
+-dontwarn org.joda.time.Instant
+###### Google Crypto Tink dependencies - end
+
 # This is generated automatically by the Android Gradle plugin.
 -dontwarn java.beans.ConstructorProperties
 -dontwarn java.beans.Transient

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/web/WCWebView.kt

@@ -74,6 +74,7 @@ fun WCWebView(
                         onPageFinished(it.url)
                         canGoBack = webView?.canGoBack() == true
                     }
+
                     is WCWebViewEvent.UrlFailed -> onUrlFailed(it.url, it.errorCode)
                 }
             }
@@ -137,7 +138,7 @@ fun WCWebView(
                         onProgressChanged = { newProgress -> progress = newProgress }
                     }
 
-                    this.settings.userAgentString = userAgent.userAgent
+                    this.settings.userAgentString = userAgent.webViewUserAgent
                 }.also { webView = it }
             },
             modifier = Modifier

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/theme/WooColors.kt

@@ -111,9 +111,9 @@ val Material3DarkColorScheme
         inverseSurface = colorResource(R.color.color_on_surface),
         inversePrimary = colorResource(R.color.color_on_primary),
         surfaceBright = colorResource(R.color.color_surface),
-        surfaceContainer = colorResource(R.color.color_surface_elevated),
+        surfaceContainer = colorResource(R.color.color_surface_elevated_04),
         surfaceContainerHigh = colorResource(R.color.color_surface_elevated),
         surfaceContainerHighest = colorResource(R.color.color_surface_elevated),
-        surfaceContainerLow = colorResource(R.color.color_surface_elevated),
-        surfaceContainerLowest = colorResource(R.color.color_surface_elevated),
+        surfaceContainerLow = colorResource(R.color.color_elevation_overlay_01),
+        surfaceContainerLowest = colorResource(R.color.color_elevation_overlay_01),
     )

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

@@ -13,7 +13,7 @@ import com.woocommerce.android.widgets.AppRatingDialog
 import org.wordpress.android.util.ToastUtils
 
 object OrderShipmentTrackingHelper {
-    private fun copyTrackingNumber(
+    fun copyTrackingNumber(
         context: Context,
         trackingNumber: String
     ) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailFragment.kt

@@ -78,12 +78,14 @@ import com.woocommerce.android.ui.orders.details.adapter.OrderDetailShippingLabe
 import com.woocommerce.android.ui.orders.details.editing.OrderEditingViewModel
 import com.woocommerce.android.ui.orders.details.views.OrderDetailAttributionInfoView
 import com.woocommerce.android.ui.orders.details.views.OrderDetailOrderStatusView.Mode
+import com.woocommerce.android.ui.orders.details.views.OrderDetailWooShippingShipmentListView
 import com.woocommerce.android.ui.orders.fulfill.OrderFulfillViewModel
 import com.woocommerce.android.ui.orders.list.OrderListFragment
 import com.woocommerce.android.ui.orders.notes.AddOrderNoteFragment
 import com.woocommerce.android.ui.orders.shippinglabels.PrintShippingLabelFragment
 import com.woocommerce.android.ui.orders.shippinglabels.ShippingLabelRefundFragment
 import com.woocommerce.android.ui.orders.tracking.AddOrderShipmentTrackingFragment
+import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShipmentUIModel
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShippingLabelModel
 import com.woocommerce.android.ui.orders.wooshippinglabels.refund.WooShippingLabelRefundFragment
 import com.woocommerce.android.ui.payments.cardreader.payment.CardReaderPaymentDialogFragment
@@ -450,9 +452,12 @@ class OrderDetailFragment :
         viewModel.shipmentTrackings.observe(viewLifecycleOwner) {
             showShipmentTrackings(it)
         }
+        viewModel.wooShippingShipments.observe(viewLifecycleOwner) {
+            updateWooShippingShipments(it)
+        }
         viewModel.shippingLabels.observe(viewLifecycleOwner) {
             lifecycleScope.launch {
-                showShippingLabels(it, viewModel.awaitOrder().currency, viewModel.isRevampWooShippingEnabled)
+                showShippingLabels(it, viewModel.awaitOrder().currency)
             }
         }
         viewModel.subscriptions.observe(viewLifecycleOwner) {
@@ -808,10 +813,29 @@ class OrderDetailFragment :
         )
     }
 
+    private fun updateWooShippingShipments(
+        shipments: List<ShipmentUIModel>
+    ) {
+        with(binding.orderDetailWooShippingShipmentList) {
+            isVisible = shipments.isNotEmpty()
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+
+            setContent {
+                WooThemeWithBackground {
+                    OrderDetailWooShippingShipmentListView(
+                        shipments = shipments,
+                        onCreateShippingLabelClicked = viewModel::onCreateShippingLabelButtonTapped,
+                        onViewShippingLabelClicked = viewModel::onViewShippingLabelClicked,
+                        onRequestRefundClicked = viewModel::onRefundShippingLabelClick
+                    )
+                }
+            }
+        }
+    }
+
     private fun showShippingLabels(
         shippingLabels: List<ShippingLabelModel>,
-        currency: String,
-        isRevampWooShippingEnabled: Boolean
+        currency: String
     ) {
         shippingLabels.whenNotNullNorEmpty {
             with(binding.orderDetailShippingLabelList) {
@@ -820,7 +844,6 @@ class OrderDetailFragment :
                     shippingLabels = shippingLabels,
                     productImageMap = productImageMap,
                     formatCurrencyForDisplay = currencyFormatter.buildBigDecimalFormatter(currency),
-                    isRevampWooShippingEnabled = isRevampWooShippingEnabled,
                     productClickListener = this@OrderDetailFragment,
                     shippingLabelClickListener = object : OnShippingLabelClickListener {
                         override fun onRefundRequested(shippingLabel: ShippingLabelModel) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt

@@ -57,7 +57,9 @@ import com.woocommerce.android.ui.orders.creation.shipping.GetShippingMethodsWit
 import com.woocommerce.android.ui.orders.creation.shipping.RefreshShippingMethods
 import com.woocommerce.android.ui.orders.creation.shipping.ShippingLineDetails
 import com.woocommerce.android.ui.orders.creation.shipping.ShippingMethodsRepository
+import com.woocommerce.android.ui.orders.wooshippinglabels.GetShipments
 import com.woocommerce.android.ui.orders.wooshippinglabels.datasource.WooShippingEligibilityDataStore
+import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShipmentUIModel
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.ShippingLabelModel
 import com.woocommerce.android.ui.orders.wooshippinglabels.models.fillProducts
 import com.woocommerce.android.ui.orders.wooshippinglabels.networking.WooShippingLabelRepository
@@ -113,6 +115,7 @@ class OrderDetailViewModel @Inject constructor(
     private val shippingLabelOnboardingRepository: ShippingLabelOnboardingRepository,
     private val shippingLabelRepository: WooShippingLabelRepository,
     private val eligibilityDataStore: WooShippingEligibilityDataStore,
+    private val getWooShippingShipments: GetShipments,
     private val orderDetailsTransactionLauncher: OrderDetailsTransactionLauncher,
     private val getOrderSubscriptions: GetOrderSubscriptions,
     private val giftCardRepository: GiftCardRepository,
@@ -154,6 +157,10 @@ class OrderDetailViewModel @Inject constructor(
     private val _shipmentTrackings = MutableLiveData<List<OrderShipmentTracking>>()
     val shipmentTrackings: LiveData<List<OrderShipmentTracking>> = _shipmentTrackings
 
+    private val _wooShippingShipments = MutableLiveData<List<ShipmentUIModel>>()
+    val wooShippingShipments: LiveData<List<ShipmentUIModel>> = _wooShippingShipments
+
+    // Legacy Woo Tax shipping labels
     private val _shippingLabels = MutableLiveData<List<ShippingLabelModel>>()
     val shippingLabels: LiveData<List<ShippingLabelModel>> = _shippingLabels
 
@@ -212,7 +219,7 @@ class OrderDetailViewModel @Inject constructor(
 
     private var pluginsInformation: Map<String, WooPlugin> = HashMap()
 
-    val isRevampWooShippingEnabled: Boolean
+    private val isRevampWooShippingEnabled: Boolean
         get() = FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled() &&
             shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
 
@@ -703,11 +710,11 @@ class OrderDetailViewModel @Inject constructor(
         triggerEvent(ViewCreateShippingLabelInfo)
     }
 
-    fun onCreateShippingLabelButtonTapped() {
+    fun onCreateShippingLabelButtonTapped(shipmentId: Int? = null) {
         tracker.trackShippingLabelTapped()
         launch {
             if (isRevampWooShippingEnabled) {
-                triggerEvent(StartWooShippingLabelCreationFlow(awaitOrder().id))
+                triggerEvent(StartWooShippingLabelCreationFlow(awaitOrder().id, shipmentId))
             } else {
                 triggerEvent(StartShippingLabelCreationFlow(awaitOrder().id))
             }
@@ -904,26 +911,37 @@ class OrderDetailViewModel @Inject constructor(
         orderDetailsTransactionLauncher.onGiftCardsFetched()
     }
 
+    private suspend fun loadWooShippingShipments(): ListInfo<ShipmentUIModel> {
+        if (!isRevampWooShippingEnabled ||
+            eligibilityDataStore.observeEligibility(navArgs.orderId).first() != true
+        ) {
+            return ListInfo(isVisible = false)
+        }
+
+        return ListInfo(isVisible = true, list = getWooShippingShipments(awaitOrder()))
+    }
+
+    @Suppress("ReturnCount")
     private suspend fun loadOrderShippingLabels(): ListInfo<ShippingLabelModel> {
-        if (isRevampWooShippingEnabled) {
-            shippingLabelRepository.getPurchasedLabels(navArgs.orderId)
-        } else {
-            orderDetailRepository.getOrderShippingLabels(navArgs.orderId)
-                .map { it.toShippingLabelModel() }
-        }.fillProducts(awaitOrder().items)
+        if (isRevampWooShippingEnabled) return ListInfo(isVisible = false)
+        orderDetailRepository.getOrderShippingLabels(navArgs.orderId)
+            .map { it.toShippingLabelModel() }
+            .fillProducts(awaitOrder().items)
             .whenNotNullNorEmpty { return ListInfo(list = it) }
+
         return ListInfo(isVisible = false)
     }
 
     private suspend fun displayProductAndShippingDetails() {
+        val wooShippingShipments = loadWooShippingShipments()
         val shippingLabels = loadOrderShippingLabels()
         val shipmentTracking = loadShipmentTracking(shippingLabels)
         val orderRefunds = loadOrderRefunds()
         val orderProducts = loadOrderProducts(orderRefunds)
 
-        if (shippingLabels.isVisible) {
-            _shippingLabels.value = shippingLabels.list
-        }
+        _wooShippingShipments.value = wooShippingShipments.let { if (it.isVisible) it.list else emptyList() }
+
+        _shippingLabels.value = shippingLabels.let { if (it.isVisible) it.list else emptyList() }
 
         if (orderProducts.isVisible) {
             _productList.value = orderProducts.list
@@ -943,9 +961,9 @@ class OrderDetailViewModel @Inject constructor(
 
         val orderEligibleForInPersonPayments = viewState.orderInfo?.isPaymentCollectableWithCardReader == true
 
-        val isOrderEligibleForSLCreation = isOrderEligibleForSLCreation(orderEligibleForInPersonPayments)
+        val isOrderEligibleForLegacySLCreation = isOrderEligibleForLegacySLCreation(orderEligibleForInPersonPayments)
 
-        if (isOrderEligibleForSLCreation &&
+        if (isOrderEligibleForLegacySLCreation &&
             viewState.isCreateShippingLabelButtonVisible != true &&
             viewState.isProductListMenuVisible != true
         ) {
@@ -955,11 +973,10 @@ class OrderDetailViewModel @Inject constructor(
         }
 
         viewState = viewState.copy(
-            isCreateShippingLabelButtonVisible = isOrderEligibleForSLCreation,
-            isProductListMenuVisible = isOrderEligibleForSLCreation && shippingLabels.isVisible,
+            isCreateShippingLabelButtonVisible = isOrderEligibleForLegacySLCreation,
+            isProductListMenuVisible = isOrderEligibleForLegacySLCreation && shippingLabels.isVisible,
             isShipmentTrackingAvailable = shipmentTracking.isVisible,
             isProductListVisible = orderProducts.isVisible,
-            areShippingLabelsVisible = shippingLabels.isVisible,
             wcShippingBannerVisible = shippingLabelOnboardingRepository.shouldShowWcShippingBanner(
                 awaitOrder(),
                 orderEligibleForInPersonPayments
@@ -968,13 +985,11 @@ class OrderDetailViewModel @Inject constructor(
         )
     }
 
-    private suspend fun isOrderEligibleForSLCreation(orderEligibleForInPersonPayments: Boolean) =
-        if (isRevampWooShippingEnabled) {
-            eligibilityDataStore.observeEligibility(awaitOrder().id).first() == true
-        } else {
+    private suspend fun isOrderEligibleForLegacySLCreation(orderEligibleForInPersonPayments: Boolean) =
+        !isRevampWooShippingEnabled &&
             shippingLabelOnboardingRepository.shippingPluginSupport.isSupported() &&
-                orderDetailRepository.isOrderEligibleForSLCreation(awaitOrder().id)
-        } && !orderEligibleForInPersonPayments
+            orderDetailRepository.isOrderEligibleForSLCreation(awaitOrder().id) &&
+            !orderEligibleForInPersonPayments
 
     private suspend fun shouldShowThankYouNoteButton() =
         selectedSite.getIfExists()?.isWPComAtomic == true &&