Merge branch 'trunk' into feature-branch-for-pos-product-migration

Author: malinajirka

.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

@@ -28,16 +28,16 @@ jobs:
         if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
         run: |
           set -e
-          number=$(gh api repos/$GITHUB_REPOSITORY/milestones \
+          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].number')
+            | .[0].title')
 
-          if [ -n "$number" ]; then
-            echo "Assigning milestone #$number to PR #${{ github.event.pull_request.number }}"
-            gh pr edit "${{ github.event.pull_request.number }}" --milestone "$number"
+          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

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]

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/di/ApplicationPasswordsModule.kt

@@ -0,0 +1,24 @@
+package com.woocommerce.android.wear.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
+import javax.inject.Inject
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface ApplicationPasswordsModule {
+    @Binds
+    fun bindApplicationPasswordsConfiguration(
+        configuration: WooWearApplicationPasswordsConfiguration
+    ): ApplicationPasswordsConfiguration
+}
+
+class WooWearApplicationPasswordsConfiguration @Inject constructor() : ApplicationPasswordsConfiguration {
+    override val applicationName: String = ""
+
+    override fun isEnabledForDirectAccess(): Boolean = false
+    override suspend fun isEnabledForJetpackAccess(): Boolean = false
+}

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

@@ -134,7 +134,8 @@ object AppPrefs {
         CUSTOM_FIELDS_TOP_BANNER_DISMISSED,
         BLAZE_CAMPAIGN_SELECTED_OBJECTIVE,
         BLAZE_CAMPAIGN_OBJECTIVE_SWITCH_CHECKED,
-        IS_SITE_WPCOM_SUSPENDED
+        IS_SITE_WPCOM_SUSPENDED,
+        JETPACK_APP_PASSWORDS_ENABLED
     }
 
     /**
@@ -301,6 +302,10 @@ object AppPrefs {
         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)
+
     fun getProductSortingChoice(currentSiteId: Int) = getString(getProductSortingKey(currentSiteId)).orNullIfEmpty()
 
     fun setProductSortingChoice(currentSiteId: Int, value: String) {

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

@@ -42,6 +42,8 @@ open class AppPrefsWrapper @Inject constructor() {
     open var orderSummaryMigrated by AppPrefs::orderSummaryMigrated
     open var gatewayMigrated by AppPrefs::gatewayMigrated
 
+    var jetpackAppPasswordsEnabled by AppPrefs::jetpackAppPasswordsEnabled
+
     fun getAppInstallationDate() = AppPrefs.installationDate
 
     fun getReceiptUrl(localSiteId: Int, remoteSiteId: Long, selfHostedSiteId: Long, orderId: Long) =

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

@@ -0,0 +1,18 @@
+package com.woocommerce.android.applicationpasswords
+
+import com.woocommerce.android.AppPrefsWrapper
+import com.woocommerce.android.BuildConfig
+import com.woocommerce.android.util.DeviceInfo
+import com.woocommerce.android.util.FeatureFlag.APP_PASSWORDS_FOR_JETPACK_SITES
+import jakarta.inject.Inject
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
+
+class WooApplicationPasswordsConfiguration @Inject constructor(
+    private val appPrefs: AppPrefsWrapper
+) : ApplicationPasswordsConfiguration {
+    override val applicationName: String =
+        "${BuildConfig.APPLICATION_ID}.app-client.${DeviceInfo.name.replace(' ', '-')}"
+
+    override suspend fun isEnabledForJetpackAccess(): Boolean =
+        APP_PASSWORDS_FOR_JETPACK_SITES.isEnabled() && appPrefs.jetpackAppPasswordsEnabled
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/config/FirebaseRemoteConfigRepository.kt

@@ -21,8 +21,6 @@ class FirebaseRemoteConfigRepository @Inject constructor(
     companion object {
         private const val DEBUG_INTERVAL = 10L
         private const val RELEASE_INTERVAL = 31200L
-
-        const val KEY_ENABLE_JETPACK_APP_PASSWORDS_EXPERIMENT = "wcandroid_enable_jetpack_app_passwords_experiment_2"
     }
 
     private val minimumFetchIntervalInSeconds =
@@ -37,11 +35,7 @@ class FirebaseRemoteConfigRepository @Inject constructor(
     private val _fetchStatus = MutableStateFlow(RemoteConfigFetchStatus.Pending)
     override val fetchStatus: Flow<RemoteConfigFetchStatus> = _fetchStatus.asStateFlow()
 
-    private val defaultValues by lazy {
-        mapOf(
-            KEY_ENABLE_JETPACK_APP_PASSWORDS_EXPERIMENT to false.toString()
-        )
-    }
+    private val defaultValues = emptyMap<String, String>()
 
     init {
         remoteConfig.apply {
@@ -73,8 +67,4 @@ class FirebaseRemoteConfigRepository @Inject constructor(
     @VisibleForTesting
     fun observeStringRemoteValue(key: String) = changesTrigger
         .map { remoteConfig.getString(key) }
-
-    override fun isJetpackAppPasswordsExperimentEnabled(): Boolean {
-        return remoteConfig.getBoolean(KEY_ENABLE_JETPACK_APP_PASSWORDS_EXPERIMENT)
-    }
 }