Merge branch 'feature-branch-for-pos-product-migration' into issue/woomob-1280-woo-poslocal-catalog-use-new-pos-specific-product-model-step-6

Author: malinajirka

RELEASE-NOTES.txt

@@ -19,6 +19,8 @@
 - [*]  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]
+- [*] Shipping Labels: Updated the disabled button text on the package selection screen [https://github.com/woocommerce/woocommerce-android/pull/14558]
+- [*] Enhance the shipping label creation screen by making the selected hazardous box tappable [https://github.com/woocommerce/woocommerce-android/pull/14576]
 
 23.1
 -----

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

@@ -70,7 +70,6 @@ import com.woocommerce.android.ui.payments.tracking.PaymentsFlowTracker
 import com.woocommerce.android.ui.products.addons.AddonRepository
 import com.woocommerce.android.ui.products.details.ProductDetailRepository
 import com.woocommerce.android.ui.shipping.InstallWCShippingViewModel
-import com.woocommerce.android.util.FeatureFlag
 import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.util.WooLog.T
 import com.woocommerce.android.viewmodel.LiveDataDelegate
@@ -220,8 +219,7 @@ class OrderDetailViewModel @Inject constructor(
     private var pluginsInformation: Map<String, WooPlugin> = HashMap()
 
     private val isRevampWooShippingEnabled: Boolean
-        get() = FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled() &&
-            shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
+        get() = shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
 
     init {
         productImageMap.subscribeToOnProductFetchedEvents(this)

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

@@ -4,7 +4,6 @@ import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.extensions.semverCompareTo
 import com.woocommerce.android.model.Order
 import com.woocommerce.android.tools.SelectedSite
-import com.woocommerce.android.util.FeatureFlag
 import javax.inject.Inject
 
 class ShippingLabelOnboardingRepository @Inject constructor(
@@ -52,11 +51,7 @@ class ShippingLabelOnboardingRepository @Inject constructor(
                 it.isOperational &&
                     pluginVersion.semverCompareTo(SUPPORTED_WC_SHIPPING_VERSION) >= 0
             }?.let {
-                return if (FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled()) {
-                    ShippingLabelSupport.WC_SHIPPING_SUPPORTED
-                } else {
-                    ShippingLabelSupport.WCS_SUPPORTED
-                }
+                return ShippingLabelSupport.WC_SHIPPING_SUPPORTED
             }
 
         orderDetailRepository.getWooServicesPluginInfo()

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

@@ -72,7 +72,6 @@ import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.
 import com.woocommerce.android.ui.products.MutableMultipleSelectionPredicate
 import com.woocommerce.android.util.ChromeCustomTabUtils
 import com.woocommerce.android.util.CurrencyFormatter
-import com.woocommerce.android.util.FeatureFlag
 import com.woocommerce.android.util.StringUtils
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType
@@ -244,10 +243,7 @@ class OrderListFragment :
         binding.orderFiltersCard.setClickListener { viewModel.onFiltersButtonTapped() }
         initCreateOrderFAB(binding.createOrderButton)
         initSwipeBehaviour()
-
-        if (FeatureFlag.BULK_UPDATE_ORDERS_STATUS.isEnabled()) {
-            addSelectionTracker()
-        }
+        addSelectionTracker()
     }
 
     private fun addSelectionTracker() {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatCard.kt

@@ -71,6 +71,7 @@ internal fun HazmatCard(
         if (selectedCategory != null) {
             HazmatSelectionCard(
                 selectedCategory = selectedCategory,
+                onClick = onClick,
                 modifier = Modifier.padding(dimensionResource(id = R.dimen.major_100))
             )
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatSelectionCard.kt

@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.orders.wooshippinglabels.hazmat
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -11,6 +12,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
@@ -21,17 +23,17 @@ import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHa
 @Composable
 fun HazmatSelectionCard(
     selectedCategory: ShippingLabelHazmatCategory,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    onClick: OnClick? = null,
 ) {
     Spacer(modifier = Modifier.height(4.dp))
     Box(modifier = modifier) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .background(
-                    color = colorResource(R.color.light_colored_button_background),
-                    shape = RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large))
-                )
+                .clip(RoundedCornerShape(dimensionResource(R.dimen.corner_radius_large)))
+                .then(if (onClick == null) Modifier else Modifier.clickable { onClick() })
+                .background(color = colorResource(R.color.light_colored_button_background))
                 .padding(16.dp)
         ) {
             Text(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCarrierPackageScreen.kt

@@ -120,7 +120,15 @@ fun WooShippingCarrierPackageScreen(
             enabled = isAddPackageEnabled,
             onClick = onAddPackageClick
         ) {
-            Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package))
+            Text(
+                stringResource(
+                    id = if (isAddPackageEnabled) {
+                        R.string.woo_shipping_labels_package_creation_add_package
+                    } else {
+                        R.string.shipping_label_select_package_button
+                    }
+                )
+            )
         }
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCustomPackageScreen.kt

@@ -238,7 +238,15 @@ fun WooShippingCustomPackageCreationScreen(
             enabled = isAddPackageEnabled,
             onClick = { onAddPackageClick(isSaveAsTemplateChecked) }
         ) {
-            Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package))
+            Text(
+                stringResource(
+                    id = if (isAddPackageEnabled) {
+                        R.string.woo_shipping_labels_package_creation_add_package
+                    } else {
+                        R.string.woo_shipping_labels_package_creation_add_package_details
+                    }
+                )
+            )
         }
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingSavedPackageScreen.kt

@@ -103,7 +103,15 @@ fun WooShippingSavedPackageScreen(
             enabled = isAddPackageEnabled,
             onClick = onAddPackageClick
         ) {
-            Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package))
+            Text(
+                stringResource(
+                    id = if (isAddPackageEnabled) {
+                        R.string.woo_shipping_labels_package_creation_add_package
+                    } else {
+                        R.string.shipping_label_select_package_button
+                    }
+                )
+            )
         }
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt

@@ -31,7 +31,6 @@ import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.H
 import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.NonWooSiteUiModel
 import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.WooSiteUiModel
 import com.woocommerce.android.ui.sitepicker.sitevisibility.GetWooVisibleSites
-import com.woocommerce.android.util.FeatureFlag
 import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.viewmodel.LiveDataDelegate
 import com.woocommerce.android.viewmodel.MultiLiveEvent
@@ -233,8 +232,7 @@ class SitePickerViewModel @Inject constructor(
         val isSelectedSiteVisible = getWooVisibleSites().any { it.id == selectedSiteId }
         _sites.value = buildSitesList(wooSites, selectedSiteId, nonWooSites)
 
-        val isEditListEnabled = FeatureFlag.HIDE_SITES_FROM_SITE_PICKER.isEnabled() &&
-            !navArgs.openedFromLogin &&
+        val isEditListEnabled = !navArgs.openedFromLogin &&
             wooSites.size > 1
         if (isEditListEnabled && sitePickerViewState.editStoreListEnabled.not()) {
             analyticsTrackerWrapper.track(stat = AnalyticsEvent.SITE_PICKER_EDIT_BUTTON_SHOWN)