Skip to content

Commit f032e8d

Browse files
authored
Merge pull request #14874 from woocommerce/issue/woomob-1623-interac-refund-flow-is-broken-v2
Fix Interac Refund Flow
2 parents 91166fd + 2e678a8 commit f032e8d

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- [*] Fixed an issue with inconsistent data on the Customers screen [https://github.com/woocommerce/woocommerce-android/pull/14839]
1010
- [*] Fixed an issue when images for the card reader flows were not shown on tablets [https://github.com/woocommerce/woocommerce-android/pull/14849]
1111
- [*] 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]
12+
- [**] Fix the refund flow for Interac cards [https://github.com/woocommerce/woocommerce-android/pull/14874]
1213
- [**] POS: Allow merchants to view, search, and manage POS orders directly within the POS interface. [https://github.com/woocommerce/woocommerce-android/pull/14866]
1314

1415
23.5

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/refunds/RefundSummaryViewModel.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import kotlinx.coroutines.Job
3939
import kotlinx.coroutines.async
4040
import kotlinx.coroutines.launch
4141
import kotlinx.coroutines.withContext
42+
import kotlinx.coroutines.yield
4243
import kotlinx.parcelize.Parcelize
4344
import org.wordpress.android.fluxc.model.refunds.WCRefundModel
4445
import org.wordpress.android.fluxc.network.rest.wpcom.wc.WooResult
@@ -126,6 +127,7 @@ class RefundSummaryViewModel @Inject constructor(
126127
if (wasConfirmed) {
127128
if (networkStatus.isConnected()) {
128129
refundJob = launch {
130+
yield() // ensure the navigation component completes navigation before proceeding
129131
val order = order.await()
130132
refundSummaryState = refundSummaryState.copy(
131133
isFormEnabled = false

0 commit comments

Comments
 (0)