From 3ceaeb30c2eb1566f5580923c4965d7c23bd7806 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 30 Jul 2020 17:05:05 -0300 Subject: [wallet] upgrade payment flow to new API --- .../main/java/net/taler/wallet/payment/PromptPaymentFragment.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt') diff --git a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt index 6f806b7..ce2b6f7 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt @@ -95,7 +95,8 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener { when (payStatus) { is PayStatus.Prepared -> { showLoading(false) - showOrder(payStatus.contractTerms, payStatus.totalFees) + val fees = payStatus.amountEffective - payStatus.amountRaw + showOrder(payStatus.contractTerms, fees) confirmButton.isEnabled = true confirmButton.setOnClickListener { model.showProgressBar.value = true @@ -109,7 +110,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener { } is PayStatus.InsufficientBalance -> { showLoading(false) - showOrder(payStatus.contractTerms, null) + showOrder(payStatus.contractTerms) errorView.setText(R.string.payment_balance_insufficient) errorView.fadeIn() } @@ -141,7 +142,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener { } } - private fun showOrder(contractTerms: ContractTerms, totalFees: Amount?) { + private fun showOrder(contractTerms: ContractTerms, totalFees: Amount? = null) { orderView.text = contractTerms.summary adapter.setItems(contractTerms.products) if (contractTerms.products.size == 1) paymentManager.toggleDetailsShown() -- cgit v1.2.3