From 39417c5f758f5abd5e0dc11a8c21be4b307cd4e2 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 17 May 2024 08:15:44 +0000 Subject: [PATCH 1/7] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index 517fec3fe09..29d7754740f 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=18.6-rc-2 -versionCode=549 \ No newline at end of file +versionName=18.7-rc-1 +versionCode=550 \ No newline at end of file From 9b77fac39ab43d3df6e80c262175742bc8f26d19 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 17 May 2024 08:15:44 +0000 Subject: [PATCH 2/7] Update draft release notes for 18.7. --- WooCommerce/metadata/release_notes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WooCommerce/metadata/release_notes.txt b/WooCommerce/metadata/release_notes.txt index 29c8775e084..b69aa08f16f 100644 --- a/WooCommerce/metadata/release_notes.txt +++ b/WooCommerce/metadata/release_notes.txt @@ -1 +1,2 @@ -Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience! \ No newline at end of file +- [*] Products: Fixed a bug that caused the app to crash sometimes during screen rotation [https://github.com/woocommerce/woocommerce-android/pull/11484] + From 1c9fca70923502eb21b637605df42bdeef08858e Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 17 May 2024 08:15:45 +0000 Subject: [PATCH 3/7] Release Notes: add new section for next version (18.8) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 183f85f1b63..cba2cb9392b 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,8 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +18.8 +----- + + 18.7 ----- - [*] Products: Fixed a bug that caused the app to crash sometimes during screen rotation [https://github.com/woocommerce/woocommerce-android/pull/11484] From 5ae1f617d881b9c377382d84513c8e4c4dcc0c89 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 17 May 2024 11:23:35 +0200 Subject: [PATCH 4/7] Fluxc to 2.79.1. Release notes for 18.7 --- CHANGELOG.md | 3 +++ WooCommerce/metadata/release_notes.txt | 3 +-- build.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c3a4b2e1a3..4882ddf7629 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ +## 18.7 +We've fixed an issue that caused the app to crash during screen rotation, ensuring a smoother shopping experience. Update now to enjoy a more stable and reliable app! + ## 18.6 Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience! diff --git a/WooCommerce/metadata/release_notes.txt b/WooCommerce/metadata/release_notes.txt index b69aa08f16f..417c587c657 100644 --- a/WooCommerce/metadata/release_notes.txt +++ b/WooCommerce/metadata/release_notes.txt @@ -1,2 +1 @@ -- [*] Products: Fixed a bug that caused the app to crash sometimes during screen rotation [https://github.com/woocommerce/woocommerce-android/pull/11484] - +We've fixed an issue that caused the app to crash during screen rotation, ensuring a smoother shopping experience. Update now to enjoy a more stable and reliable app! diff --git a/build.gradle b/build.gradle index 5c48f8b427f..9858bc1a6a4 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ tasks.register("installGitHooks", Copy) { } ext { - fluxCVersion = 'trunk-14fcce73130015f14125e9e13837f84ff4171bb3' + fluxCVersion = '2.79.1' glideVersion = '4.16.0' coilVersion = '2.1.0' constraintLayoutVersion = '1.2.0' From e696d4e40a96a5950314cb8aab9be5979959c919 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 17 May 2024 13:34:41 +0200 Subject: [PATCH 5/7] Do not show privacy banner on the dashboard --- .../com/woocommerce/android/ui/dashboard/DashboardViewModel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt index 2515e6e2047..ffad750003b 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt @@ -27,6 +27,7 @@ import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.Selec import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardEvent.OpenEditWidgets import com.woocommerce.android.ui.dashboard.data.DashboardRepository import com.woocommerce.android.ui.prefs.privacy.banner.domain.ShouldShowPrivacyBanner +import com.woocommerce.android.util.PackageUtils import com.woocommerce.android.viewmodel.MultiLiveEvent import com.woocommerce.android.viewmodel.ResourceProvider import com.woocommerce.android.viewmodel.ScopedViewModel @@ -109,7 +110,7 @@ class DashboardViewModel @Inject constructor( launch { shouldShowPrivacyBanner().let { - if (it) { + if (it && !PackageUtils.isTesting()) { triggerEvent(DashboardEvent.ShowPrivacyBanner) } } From 5017d52627e60a23771ab50bf8a7b56ea3910fac Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 17 May 2024 12:17:02 +0000 Subject: [PATCH 6/7] Update `PlayStoreStrings.po` for 18.7 --- WooCommerce/metadata/PlayStoreStrings.pot | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WooCommerce/metadata/PlayStoreStrings.pot b/WooCommerce/metadata/PlayStoreStrings.pot index 585a76f10ae..a51ca7945ae 100644 --- a/WooCommerce/metadata/PlayStoreStrings.pot +++ b/WooCommerce/metadata/PlayStoreStrings.pot @@ -11,16 +11,16 @@ msgstr "" "Project-Id-Version: Release Notes & Play Store Descriptions\n" #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas! -msgctxt "release_note_186" +msgctxt "release_note_187" msgid "" -"18.6:\n" -"Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience!\n" +"18.7:\n" +"We've fixed an issue that caused the app to crash during screen rotation, ensuring a smoother shopping experience. Update now to enjoy a more stable and reliable app!\n" msgstr "" -msgctxt "release_note_185" +msgctxt "release_note_186" msgid "" -"18.5:\n" -"Discover a more personalized shopping experience with the latest update to MyStore! We're excited to introduce a customizable dashboard that lets you tailor your view with a variety of unique cards. Streamline your management tasks and enjoy a dashboard designed just for you. Update now to start customizing your app experience!\n" +"18.6:\n" +"Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience!\n" msgstr "" #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas! From 8d6f857913e0872edd440864ee24e9342e5c7725 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 17 May 2024 12:17:04 +0000 Subject: [PATCH 7/7] Send strings to translation. --- fastlane/resources/values/strings.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index 9c8e9495bb2..42550747513 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -371,6 +371,7 @@ Months Years Change date range button + Open filter dropdown Visitors Orders @@ -389,6 +390,7 @@ View Order View Orders + View all orders We can\'t display your\n store\'s analytics Make sure you are running the latest version of WooCommerce on your site and that you have WooCommerce Admin activated. @@ -409,6 +411,8 @@ Top performers Blaze campaigns Feedback + Most recent orders + Most recent reviews Unavailable Completed @@ -417,6 +421,10 @@ Unable to load data contact support.]]> + Status + No reviews found + No reviews match the selected filter, please try changing the filter + View all reviews @@ -563,6 +571,11 @@ Share Payment Link Checkout - %s + + Take payment (%s) + @@ -3658,6 +3671,9 @@ Settings Update your preferences + Woo Pos + Temporary entry point to POS mode +