From 3ed5374398cfecfbbab76c4b312efd95df05236c Mon Sep 17 00:00:00 2001 From: malinajirka Date: Fri, 31 Oct 2025 09:39:32 +0100 Subject: [PATCH 1/2] Fix interac refund flow --- .../android/ui/payments/refunds/RefundSummaryViewModel.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/refunds/RefundSummaryViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/refunds/RefundSummaryViewModel.kt index 2b6499f4b5a7..19a88c3561f2 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/refunds/RefundSummaryViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/refunds/RefundSummaryViewModel.kt @@ -39,6 +39,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.async import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import kotlinx.coroutines.yield import kotlinx.parcelize.Parcelize import org.wordpress.android.fluxc.model.refunds.WCRefundModel import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult @@ -126,6 +127,7 @@ class RefundSummaryViewModel @Inject constructor( if (wasConfirmed) { if (networkStatus.isConnected()) { refundJob = launch { + yield() // ensure the navigation component completes navigation before proceeding val order = order.await() refundSummaryState = refundSummaryState.copy( isFormEnabled = false From cd7ed33232789e1017fc8381866f3a693631731c Mon Sep 17 00:00:00 2001 From: malinajirka Date: Fri, 31 Oct 2025 09:52:01 +0100 Subject: [PATCH 2/2] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index acbc529d12de..88781be831e7 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -8,6 +8,7 @@ - [*] Improved the Filters button colors on the Orders and Products screens [https://github.com/woocommerce/woocommerce-android/pull/14832] - [*] Fixed an issue when images for the card reader flows were not shown on tablets [https://github.com/woocommerce/woocommerce-android/pull/14849] - [*] Fixed an issue where the count of the filters applied to the orders was not updated correctly [https://github.com/woocommerce/woocommerce-android/pull/14844] +- [**] Fix the refund flow for Interac cards [https://github.com/woocommerce/woocommerce-android/pull/14874] 23.5 -----