diff options
author | Torsten Grote <t@grobox.de> | 2020-05-14 14:13:18 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-05-15 14:26:42 -0300 |
commit | 69093aa9055da501fd14103ac772d730850cb7b4 (patch) | |
tree | 4886bd05b7790df295902ed44fcca93146fd06fc /wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt | |
parent | 171a1ae228b801d5c0d54c6c7e7ad8aa458d6bce (diff) | |
download | taler-android-69093aa9055da501fd14103ac772d730850cb7b4.tar.gz taler-android-69093aa9055da501fd14103ac772d730850cb7b4.tar.bz2 taler-android-69093aa9055da501fd14103ac772d730850cb7b4.zip |
[wallet] Remove success pages for withdrawal and payment
The user is now brought the the transaction list where both are shown
directly as pending transactions.
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt index 747551b..e700f67 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt @@ -24,12 +24,14 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer import androidx.navigation.fragment.findNavController +import com.google.android.material.snackbar.Snackbar +import com.google.android.material.snackbar.Snackbar.LENGTH_LONG import kotlinx.android.synthetic.main.fragment_prompt_withdraw.* import net.taler.common.Amount import net.taler.common.fadeIn import net.taler.common.fadeOut -import net.taler.wallet.R import net.taler.wallet.MainViewModel +import net.taler.wallet.R import net.taler.wallet.cleanExchange import net.taler.wallet.withdraw.WithdrawStatus.Loading import net.taler.wallet.withdraw.WithdrawStatus.TermsOfServiceReviewRequired @@ -63,7 +65,11 @@ class PromptWithdrawFragment : Fragment() { setOnClickListener { it.fadeOut() confirmProgressBar.fadeIn() - withdrawManager.acceptWithdrawal(status.talerWithdrawUri, status.exchange) + withdrawManager.acceptWithdrawal( + status.talerWithdrawUri, + status.exchange, + status.amount.currency + ) } isEnabled = true } @@ -71,7 +77,10 @@ class PromptWithdrawFragment : Fragment() { is WithdrawStatus.Success -> { model.showProgressBar.value = false withdrawManager.withdrawStatus.value = null - findNavController().navigate(R.id.action_promptWithdraw_to_withdrawSuccessful) + // TODO bring the user to the currency's transaction page, if there's more than one currency + model.transactionManager.selectedCurrency = status.currency + findNavController().navigate(R.id.action_promptWithdraw_to_nav_main) + Snackbar.make(requireView(), R.string.withdraw_initiated, LENGTH_LONG).show() } is Loading -> { model.showProgressBar.value = true |