Merge branch 'trunk' into issue/WOOMOB-727-fix-small-notification-icon-issue

Author: hichamboushaba

RELEASE-NOTES.txt

@@ -3,6 +3,9 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 23.3
 -----
+- [Internal] Migration to POS specific product model [https://github.com/woocommerce/woocommerce-android/pull/14598]
+- [*] Enhance the shipping label creation screen by making the selected hazardous box tappable [https://github.com/woocommerce/woocommerce-android/pull/14576]
+- [*] Shipping Labels: Enhance selected package UI in the create shipping label flow [https://github.com/woocommerce/woocommerce-android/pull/14579]
 - [*] Fixed the incorrect size of the notification icon [https://github.com/woocommerce/woocommerce-android/pull/14586]
 
 23.2
@@ -16,9 +19,11 @@
 - [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]
+- [*] Shipping Labels: Adds caching to the "Select a Package" screen [https://github.com/woocommerce/woocommerce-android/pull/14541]
 - [*]  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]
 
 23.1
 -----

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/datasource/StatsRepository.kt

@@ -101,7 +101,6 @@ class StatsRepository @Inject constructor(
                 result.granularity,
                 result.quantity,
                 result.date,
-                result.isCustomField
             ).let {
                 Result.success(it.values.sum())
             }

WooCommerce/build.gradle

@@ -294,10 +294,7 @@ dependencies {
     implementation(libs.bumptech.glide.main)
     ksp(libs.bumptech.glide.compiler)
     implementation(libs.bumptech.glide.volley.integration)
-    implementation libs.avif
-    implementation(libs.bumptech.glide.avif.integration) {
-        exclude group: 'org.aomedia.avif.android', module: 'avif'
-    }
+    implementation(libs.bumptech.glide.avif.integration)
     implementation(libs.google.play.app.update)
     implementation(libs.google.play.review)
 

WooCommerce/src/androidTest/assets/mocks/mappings/sites/rest_sites_161477129.json

@@ -47,6 +47,7 @@
                 "view_stats": true
             },
             "jetpack": true,
+            "jetpack_connection": true,
             "visible": true,
             "is_private": false,
             "options": {

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/WooCommerceTest.kt

@@ -1,7 +1,6 @@
 package com.woocommerce.android
 
 import android.app.Application
-import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.yarolegovich.wellsql.WellSql
 import dagger.android.AndroidInjector
@@ -19,12 +18,6 @@ interface WooCommerceTest
 open class BaseWooCommerce : Application(), HasAndroidInjector, Configuration.Provider {
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder()
-            .setWorkerFactory(
-                EntryPoints.get(
-                    this,
-                    HiltWorkerFactoryEntryPoint::class.java
-                ).workerFactory()
-            )
             .build()
 
     @EntryPoint
@@ -33,12 +26,6 @@ open class BaseWooCommerce : Application(), HasAndroidInjector, Configuration.Pr
         fun injector(): DispatchingAndroidInjector<Any>
     }
 
-    @EntryPoint
-    @InstallIn(SingletonComponent::class)
-    interface HiltWorkerFactoryEntryPoint {
-        fun workerFactory(): HiltWorkerFactory
-    }
-
     override fun onCreate() {
         super.onCreate()
         val wellSqlConfig = WooWellSqlConfig(this)

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/ui/ProductSelectorScreenTest.kt

@@ -9,14 +9,18 @@ import com.woocommerce.android.ui.products.selector.ProductSelectorScreen
 import com.woocommerce.android.ui.products.selector.ProductSelectorViewModel
 import com.woocommerce.android.ui.products.selector.ProductSelectorViewModel.ListItem.ProductListItem
 import com.woocommerce.android.ui.products.selector.SelectionState
+import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Rule
 import org.junit.Test
 
 @HiltAndroidTest
 class ProductSelectorScreenTest {
 
-    @get:Rule
+    @get:Rule(order = 0)
+    val hiltRule = HiltAndroidRule(this)
+
+    @get:Rule(order = 1)
     val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test

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

@@ -44,6 +44,7 @@ import com.woocommerce.android.ui.jitm.JitmStoreInMemoryCache
 import com.woocommerce.android.ui.login.AccountRepository
 import com.woocommerce.android.ui.main.MainActivity
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingChecker
+import com.woocommerce.android.ui.woopos.localcatalog.WooPosLocalCatalogSyncScheduler
 import com.woocommerce.android.util.AppThemeUtils
 import com.woocommerce.android.util.ApplicationEdgeToEdgeEnabler
 import com.woocommerce.android.util.ApplicationLifecycleMonitor
@@ -63,6 +64,8 @@ import dagger.android.DispatchingAndroidInjector
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -92,6 +95,7 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
         private const val SECONDS_BETWEEN_SITE_UPDATE = 60 * 60 // 1 hour
         private const val UNAUTHORIZED_STATUS_CODE = 401
         private const val CARD_READER_USAGE_THIRTY_DAYS = 30
+        private const val POS_LOCAL_CATALOG_SYNC_INITIAL_DELAY_SECONDS = 20000L
     }
 
     @Inject lateinit var crashLogging: CrashLogging
@@ -159,6 +163,8 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
 
     @Inject lateinit var edgeToEdgeEnabler: ApplicationEdgeToEdgeEnabler
 
+    @Inject lateinit var posLocalCatalogScheduler: WooPosLocalCatalogSyncScheduler
+
     private var connectionReceiverRegistered = false
 
     private lateinit var application: Application
@@ -168,19 +174,22 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
      */
     private val updateSelectedSite: RateLimitedTask = object : RateLimitedTask(SECONDS_BETWEEN_SITE_UPDATE) {
         override fun run(): Boolean {
-            selectedSite.getIfExists()?.let {
+            selectedSite.getIfExists()?.let { site ->
                 appCoroutineScope.launch {
-                    wooCommerceStore.fetchWooCommerceSite(it).model?.let {
+                    wooCommerceStore.fetchWooCommerceSite(site).model?.let {
                         if (!it.hasWooCommerce && it.connectionType == ApplicationPasswords) {
                             // The previously selected site doesn't have Woo anymore, take the user to the login screen
                             WooLog.w(T.LOGIN, "Selected site no longer has WooCommerce")
 
                             selectedSite.reset()
                             restartMainActivity()
                         }
+                        if (it.connectionType != ApplicationPasswords && it.isApplicationPasswordsSupported) {
+                            analyticsTracker.track(AnalyticsEvent.JETPACK_SITE_ELIGIBLE_FOR_APP_PASSWORD_SUPPORT)
+                        }
                     }
-                    wooCommerceStore.fetchSiteGeneralSettings(it)
-                    wooCommerceStore.fetchSiteProductSettings(it)
+                    wooCommerceStore.fetchSiteGeneralSettings(site)
+                    wooCommerceStore.fetchSiteProductSettings(site)
                 }
             }
             return true
@@ -238,6 +247,9 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
 
         // Schedule worker to refresh FCM token periodically
         FCMRefreshWorker.schedule(application)
+
+        posLocalCatalogScheduler.schedulePeriodicFullCatalogSync()
+        observeSiteChangesForCatalogSync()
     }
 
     @Suppress("DEPRECATION")
@@ -386,6 +398,7 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
                 // to prevent duplicate install events being called
                 prefs.setLastAppVersionCode(versionCode)
             }
+
             oldVersionCode < versionCode -> {
                 // Track upgrade event only if oldVersionCode is not -1, to prevent
                 // duplicate upgrade events being called
@@ -397,6 +410,7 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
                 // is greater than the stored version code
                 prefs.setLastAppVersionCode(versionCode)
             }
+
             versionCode == PackageUtils.PACKAGE_VERSION_CODE_DEFAULT -> {
                 // we are not able to read the current app version code
                 // track this event along with the last stored version code
@@ -424,6 +438,19 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
         }
     }
 
+    fun observeSiteChangesForCatalogSync() {
+        appCoroutineScope.launch {
+            selectedSite.observe()
+                .drop(1) // invoke only on site change not on app initialization
+                .collect { selectedSite ->
+                    if (selectedSite != null) {
+                        delay(POS_LOCAL_CATALOG_SYNC_INITIAL_DELAY_SECONDS)
+                        posLocalCatalogScheduler.triggerManualFullCatalogSync()
+                    }
+                }
+        }
+    }
+
     @Suppress("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onUnexpectedError(event: OnUnexpectedError) {

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -212,7 +212,6 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     ORDERS_LIST_AUTOMATIC_TIMEOUT_RETRY,
     ORDERS_LIST_TOP_BANNER_TROUBLESHOOT_TAPPED,
     TEST_ORDER_START_TAPPED,
-    ORDERS_LIST_APP_PASSWORDS_FAILURE,
 
     FILTER_ORDERS_BY_STATUS_DIALOG_OPTION_SELECTED,
     ORDER_FILTER_LIST_CLEAR_MENU_BUTTON_TAPPED,
@@ -939,6 +938,10 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     LOGIN_SITE_CREDENTIALS_APP_PASSWORD_LOGIN_EXIT_CONFIRMATION,
     LOGIN_SITE_CREDENTIALS_APP_PASSWORD_LOGIN_DISMISSED,
 
+    // Application passwords for Jetpack sites
+    JETPACK_SITE_ELIGIBLE_FOR_APP_PASSWORD_SUPPORT,
+    JETPACK_SITE_FLAGGED_UNSUPPORTED_FOR_APP_PASSWORDS,
+
     // Free Trial
     FREE_TRIAL_UPGRADE_NOW_TAPPED,
     PLAN_UPGRADE_SUCCESS,

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt

@@ -250,6 +250,8 @@ class AnalyticsTracker private constructor(
         const val KEY_TIME_TAKEN = "time_taken"
         const val KEY_IS_EDITING = "is_editing"
         const val KEY_POS_ONBOARDING_STATE = "onboarding_state"
+        const val KEY_API_ERROR_CODE = "api_error_code"
+        const val KEY_HTTP_STATUS_CODE = "http_status_code"
 
         const val KEY_SORT_ORDER = "order"
         const val VALUE_DEVICE_TYPE_REGULAR = "regular"

WooCommerce/src/main/kotlin/com/woocommerce/android/applicationpasswords/ApplicationPasswordsNotifier.kt

@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsListener
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.JetpackSiteFlaggedAsUnsupported
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -66,6 +67,18 @@ class ApplicationPasswordsNotifier @Inject constructor(
         )
     }
 
+    override fun onJetpackSiteFlaggedAsUnsupported(event: JetpackSiteFlaggedAsUnsupported) {
+        analyticsTrackerWrapper.track(
+            stat = AnalyticsEvent.JETPACK_SITE_FLAGGED_UNSUPPORTED_FOR_APP_PASSWORDS,
+            properties = mapOf(
+                AnalyticsTracker.KEY_FLOW to event.scenario.name.lowercase(),
+                AnalyticsTracker.KEY_CAUSE to event.cause.name.lowercase(),
+                AnalyticsTracker.KEY_API_ERROR_CODE to event.apiErrorCode,
+                AnalyticsTracker.KEY_HTTP_STATUS_CODE to event.httpStatusCode,
+            )
+        )
+    }
+
     private fun trackGenerationFailure(
         cause: GenerationFailureCause,
         networkError: WPAPINetworkError,