From accae1d669ec0a90cb040a6479624d622956e667 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 1 Sep 2020 11:26:29 -0300
Subject: [wallet] show fullfillment message on payment details screen

---
 wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt     | 1 -
 .../java/net/taler/wallet/transactions/TransactionDetailFragment.kt | 6 +++++-
 wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt  | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'wallet/src/main/java')

diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
index c364286..9e6984c 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
@@ -76,7 +76,6 @@ class PaymentManager(
         }.onError {
             handleError("preparePay", it)
         }.onSuccess { response ->
-            Log.e(TAG, "PreparePayResponse $response") // TODO remove
             mPayStatus.value = when (response) {
                 is PaymentPossibleResponse -> response.toPayStatusPrepared()
                 is InsufficientBalanceResponse -> InsufficientBalance(
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index 1103207..f15e34f 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -144,7 +144,11 @@ class TransactionDetailFragment : Fragment() {
     private fun bindOrderAndFee(info: TransactionInfo, raw: Amount, fee: Amount) {
         orderAmountView.text = raw.toString()
         feeView.text = getString(R.string.amount_negative, fee.toString())
-        orderSummaryView.text = info.summary
+        orderSummaryView.text = if (info.fulfillmentMessage == null) {
+            info.summary
+        } else {
+            "${info.summary}\n\n${info.fulfillmentMessage}"
+        }
         if (info.fulfillmentUrl?.startsWith("http") == true) {
             val i = Intent().apply {
                 data = Uri.parse(info.fulfillmentUrl)
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index 603b754..db3f283 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -154,7 +154,6 @@ class TransactionInfo(
     val fulfillmentUrl: String? = null,
     /**
      * Message shown to the user after the payment is complete.
-     * TODO actually show this
      */
     val fulfillmentMessage: String? = null,
     /**
-- 
cgit v1.2.3