Skip to content

Merge release/24.3 into trunk#15501

Merged
malinajirka merged 10 commits intotrunkfrom
merge/release-24.3-into-trunk
Mar 10, 2026
Merged

Merge release/24.3 into trunk#15501
malinajirka merged 10 commits intotrunkfrom
merge/release-24.3-into-trunk

Conversation

@wpmobilebot
Copy link
Copy Markdown
Collaborator

Merging release/24.3 into trunk.

Via intermediate branch merge/release-24.3-into-trunk, to help fix conflicts if any:

                            release/24.3  ----o-- - - -
                                               \
           merge/release-24.3-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

malinajirka and others added 10 commits March 6, 2026 10:12
Adds logic to convert `modified_after` timestamps from UTC to site-local time when querying products and variations. Includes utility function for adjusting time based on site timezone offset to ensure accurate API filtering.
… WooPosProductRestClient

Introduces comprehensive unit tests to verify timestamp adjustment logic based on site timezone offsets, ensuring accurate handling across various edge cases.
…n in WooPosProductRestClient

Introduces a try-catch block to handle `DateTimeException` during UTC to site-local time conversion. Logs the error and falls back to the UTC string.
Replaces manual calculation of seconds per hour with Kotlin's `Duration` API for improved readability and consistency.
…nc-misses-product-updates-for-sites-with

[WOOMOB-2442] Fix incremental sync missing product updates for sites with negative UTC offsets
Add missing admin.php segment and use the correct /woocommerce/services/edit/ path for the next-admin URL.
…uct-webview-url

[WOOMOB-2421] Fix product detail webview URL path
@wpmobilebot wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Mar 9, 2026
@wpmobilebot wpmobilebot added this to the 24.4 milestone Mar 9, 2026
@dangermattic
Copy link
Copy Markdown
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Copy Markdown
Collaborator Author

Project manifest changes for WooCommerce

The following changes in the WooCommerce's merged AndroidManifest.xml file were detected (build variant: vanillaRelease):

--- ./build/reports/diff_manifest/WooCommerce/vanillaRelease/base_manifest.txt	2026-03-09 16:08:33.468307769 +0000
+++ ./build/reports/diff_manifest/WooCommerce/vanillaRelease/head_manifest.txt	2026-03-09 16:08:39.868328604 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.woocommerce.android"
-    android:versionCode="732"
-    android:versionName="24.3-rc-1" >
+    android:versionCode="734"
+    android:versionName="24.3-rc-3" >
 
     <uses-sdk
         android:minSdkVersion="26"

Go to https://buildkite.com/automattic/woocommerce-android/builds/36400/canvas?sid=019cd351-990b-41f0-886b-4cb53c686390, click on the Artifacts tab and audit the files.

@wpmobilebot
Copy link
Copy Markdown
Collaborator Author

Project manifest changes for WooCommerce-Wear

The following changes in the WooCommerce-Wear's merged AndroidManifest.xml file were detected (build variant: vanillaRelease):

--- ./build/reports/diff_manifest/WooCommerce-Wear/vanillaRelease/base_manifest.txt	2026-03-09 16:08:49.228359072 +0000
+++ ./build/reports/diff_manifest/WooCommerce-Wear/vanillaRelease/head_manifest.txt	2026-03-09 16:08:53.958374468 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.woocommerce.android"
-    android:versionCode="50732"
-    android:versionName="24.3-rc-1w" >
+    android:versionCode="50734"
+    android:versionName="24.3-rc-3w" >
 
     <uses-sdk
         android:minSdkVersion="26"

Go to https://buildkite.com/automattic/woocommerce-android/builds/36400/canvas?sid=019cd351-990b-41f0-886b-4cb53c686390, click on the Artifacts tab and audit the files.

@wpmobilebot
Copy link
Copy Markdown
Collaborator Author

App Icon📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

App NameWooCommerce Android
Platform📱 Mobile
FlavorJalapeno
Build TypeDebug
Build Number734
Version24.3-rc-3
Application IDcom.woocommerce.android.prealpha
Commit0c5b245
Installation URL08vomohpm3jh8
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 75.00000% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 39.53%. Comparing base (3f91938) to head (0c5b245).
⚠️ Report is 30 commits behind head on trunk.

Files with missing lines Patch % Lines
...st/wpcom/wc/product/pos/WooPosProductRestClient.kt 73.33% 4 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##              trunk   #15501   +/-   ##
=========================================
  Coverage     39.52%   39.53%           
- Complexity    11204    11210    +6     
=========================================
  Files          2250     2250           
  Lines        129313   129326   +13     
  Branches      18091    18094    +3     
=========================================
+ Hits          51116    51129   +13     
  Misses        72987    72987           
  Partials       5210     5210           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@malinajirka malinajirka self-assigned this Mar 10, 2026
@malinajirka malinajirka self-requested a review March 10, 2026 07:01
Copy link
Copy Markdown
Contributor

@malinajirka malinajirka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@malinajirka malinajirka merged commit ecb8a65 into trunk Mar 10, 2026
22 of 23 checks passed
@malinajirka malinajirka deleted the merge/release-24.3-into-trunk branch March 10, 2026 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Releases Used in release management. Using this label will skip some bot checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants