From 0acbbbc873714637e800976525805f752991a559 Mon Sep 17 00:00:00 2001 From: Josh Heald Date: Thu, 20 Feb 2025 12:57:40 +0000 Subject: [PATCH] 15181 Further simplify payment task cancellation --- .../CardPresentPaymentService.swift | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift b/WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift index 00c63793d43..3a46f8ab0d2 100644 --- a/WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift +++ b/WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift @@ -165,14 +165,12 @@ final class CardPresentPaymentService: CardPresentPaymentFacade { } func cancelPayment() { - paymentTask?.cancel() - paymentTask = nil + cancelPaymentTask() } @MainActor func cancelPayment() async throws { - paymentTask?.cancel() - paymentTask = nil + cancelPaymentTask() try await withCheckedThrowingContinuation { continuation in var nillableContinuation: CheckedContinuation? = continuation @@ -183,6 +181,11 @@ final class CardPresentPaymentService: CardPresentPaymentFacade { stores.dispatch(action) } } + + private func cancelPaymentTask() { + paymentTask?.cancel() + paymentTask = nil + } } private extension CardPresentPaymentService {