Merge pull request #12877 from woocommerce/custom-payment-ui-3

[POS] Custom Payment UI — Part 3 | Emitting UI–agnostic payment states in `CardReaderPaymentController`
woocommerce · Nov 19, 2024 · a73aa7f · a73aa7f
2 parents 4c8e61c + 0c4e9ec
commit a73aa7f
Show file tree

Hide file tree

Showing 6 changed files with 562 additions and 50 deletions.
diff --git a/...tlin/com/woocommerce/android/ui/payments/cardreader/payment/CardReaderPaymentViewModel.kt b/...tlin/com/woocommerce/android/ui/payments/cardreader/payment/CardReaderPaymentViewModel.kt
@@ -15,6 +15,8 @@ import com.woocommerce.android.ui.payments.cardreader.CardReaderCountryConfigPro
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingChecker
 import com.woocommerce.android.ui.payments.cardreader.payment.controller.CardReaderPaymentController
 import com.woocommerce.android.ui.payments.cardreader.payment.controller.CardReaderPaymentEvent
+import com.woocommerce.android.ui.payments.cardreader.payment.controller.CardReaderPaymentStateProvider
+import com.woocommerce.android.ui.payments.cardreader.payment.controller.CardReaderTrackCanceledFlowAction
 import com.woocommerce.android.ui.payments.receipt.PaymentReceiptHelper
 import com.woocommerce.android.ui.payments.receipt.PaymentReceiptShare
 import com.woocommerce.android.ui.payments.tracking.CardReaderTrackingInfoKeeper
@@ -41,13 +43,15 @@ class CardReaderPaymentViewModel @Inject constructor(
     paymentCollectibilityChecker: CardReaderPaymentCollectibilityChecker,
     interacRefundableChecker: CardReaderInteracRefundableChecker,
     tracker: PaymentsFlowTracker,
+    trackCancelledFlow: CardReaderTrackCanceledFlowAction,
     currencyFormatter: CurrencyFormatter,
     errorMapper: CardReaderPaymentErrorMapper,
     interacRefundErrorMapper: CardReaderInteracRefundErrorMapper,
     wooStore: WooCommerceStore,
     dispatchers: CoroutineDispatchers,
     cardReaderTrackingInfoKeeper: CardReaderTrackingInfoKeeper,
     cardReaderPaymentReaderTypeStateProvider: CardReaderPaymentReaderTypeStateProvider,
+    paymentStateProvider: CardReaderPaymentStateProvider,
     cardReaderPaymentOrderHelper: CardReaderPaymentOrderHelper,
     paymentReceiptHelper: PaymentReceiptHelper,
     cardReaderOnboardingChecker: CardReaderOnboardingChecker,
@@ -71,13 +75,15 @@ class CardReaderPaymentViewModel @Inject constructor(
         paymentCollectibilityChecker = paymentCollectibilityChecker,
         interacRefundableChecker = interacRefundableChecker,
         tracker = tracker,
+        trackCancelledFlow = trackCancelledFlow,
         currencyFormatter = currencyFormatter,
         errorMapper = errorMapper,
         interacRefundErrorMapper = interacRefundErrorMapper,
         wooStore = wooStore,
         dispatchers = dispatchers,
         cardReaderTrackingInfoKeeper = cardReaderTrackingInfoKeeper,
         cardReaderPaymentReaderTypeStateProvider = cardReaderPaymentReaderTypeStateProvider,
+        paymentStateProvider = paymentStateProvider,
         cardReaderPaymentOrderHelper = cardReaderPaymentOrderHelper,
         paymentReceiptHelper = paymentReceiptHelper,
         cardReaderOnboardingChecker = cardReaderOnboardingChecker,
@@ -88,6 +94,7 @@ class CardReaderPaymentViewModel @Inject constructor(
         isTTPPaymentInProgress = ::isTTPPaymentInProgress,
     )
 
+    @Suppress("DEPRECATION")
     val viewStateData: LiveData<ViewState> = paymentController.viewStateData
 
     override val event: LiveData<MultiLiveEvent.Event> =