From 1627d920098c84c262914fe72d63d00dcfd96aa2 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 22 Nov 2021 20:20:05 -0500 Subject: [PATCH] Fix display of boost payment processing dialog. --- .../securesms/components/settings/app/AppSettingsFragment.kt | 2 +- .../settings/app/subscription/boost/BoostViewModel.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt index 8d7fe74b4..80b65f743 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -169,7 +169,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men title = DSLSettingsText.from(R.string.preferences__signal_boost), icon = DSLSettingsIcon.from(R.drawable.ic_boost_24), onClick = { - findNavController().navigate(R.id.action_appSettingsFragment_to_boostsFragment) + findNavController().navigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToBoostsFragment()) } ) } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt index 09ee3e973..40766d2fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt @@ -139,6 +139,8 @@ class BoostViewModel( if (boost != null) { eventPublisher.onNext(DonationEvent.RequestTokenSuccess) + store.update { it.copy(stage = BoostState.Stage.PAYMENT_PIPELINE) } + donationPaymentRepository.continuePayment(boost.price, paymentData).subscribeBy( onError = { throwable -> store.update { it.copy(stage = BoostState.Stage.READY) } @@ -172,7 +174,7 @@ class BoostViewModel( return } - store.update { it.copy(stage = BoostState.Stage.PAYMENT_PIPELINE) } + store.update { it.copy(stage = BoostState.Stage.TOKEN_REQUEST) } boostToPurchase = if (snapshot.isCustomAmountFocused) { Boost(snapshot.customAmount)