From 950363a4e99570a04de610578557d9b8186bb606 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 17 Nov 2022 11:07:20 -0400 Subject: [PATCH] Don't wrap donation errors. --- .../donate/stripe/StripePaymentInProgressViewModel.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt index f46d760eb1..ac46bb430e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt @@ -135,7 +135,13 @@ class StripePaymentInProgressViewModel( .map { (_, paymentMethod) -> paymentMethod ?: secure3DSAction.paymentMethodId!! } } .flatMapCompletable { stripeRepository.setDefaultPaymentMethod(it) } - .onErrorResumeNext { Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it)) } + .onErrorResumeNext { + if (it is DonationError) { + Completable.error(it) + } else { + Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it)) + } + } disposables += setup.andThen(setLevel).subscribeBy( onError = { throwable ->