From 5ae1f617d881b9c377382d84513c8e4c4dcc0c89 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 17 May 2024 11:23:35 +0200 Subject: [PATCH 1/2] 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 2/2] 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) } }