Skip to content

Conversation

@wpmobilebot
Copy link
Collaborator

Merging release/21.3 into trunk.

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

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

@wpmobilebot wpmobilebot added the Releases Used in release management. Using this label will skip some bot checks. label Jan 10, 2025
@wpmobilebot wpmobilebot added this to the 21.4 milestone Jan 10, 2025
@dangermattic
Copy link
Collaborator

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

Generated by 🚫 Danger

@wpmobilebot
Copy link
Collaborator Author

wpmobilebot commented Jan 10, 2025

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.
App Name WooCommerce-Wear Android
Platform⌚️ Wear OS
FlavorJalapeno
Build TypeDebug
Commit551fb73
Direct Downloadwoocommerce-wear-prototype-build-pr13282-551fb73.apk

@wpmobilebot
Copy link
Collaborator Author

wpmobilebot commented Jan 10, 2025

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

App Name WooCommerce Android
Platform📱 Mobile
FlavorJalapeno
Build TypeDebug
Commit551fb73
Direct Downloadwoocommerce-prototype-build-pr13282-551fb73.apk

# Conflicts:
#	WooCommerce/src/main/res/values-es/strings.xml
#	WooCommerce/src/main/res/values-ko/strings.xml
#	WooCommerce/src/main/res/values-sv/strings.xml
Copy link
Member

@hichamboushaba hichamboushaba left a comment

Choose a reason for hiding this comment

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

LGTM

@hichamboushaba hichamboushaba merged commit 9230a98 into trunk Jan 10, 2025
15 checks passed
@hichamboushaba hichamboushaba deleted the merge/release-21.3-into-trunk branch January 10, 2025 11:34
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 40.80%. Comparing base (fd66790) to head (551fb73).
Report is 9 commits behind head on trunk.

Files with missing lines Patch % Lines
...ain/kotlin/com/woocommerce/android/model/Refund.kt 0.00% 0 Missing and 3 partials ⚠️
.../java/com/woocommerce/android/wear/model/Refund.kt 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##              trunk   #13282      +/-   ##
============================================
+ Coverage     40.79%   40.80%   +0.01%     
  Complexity     6411     6411              
============================================
  Files          1353     1353              
  Lines         77679    77679              
  Branches      10692    10692              
============================================
+ Hits          31689    31698       +9     
+ Misses        43183    43172      -11     
- Partials       2807     2809       +2     

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

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.

6 participants