Show Refresh events to the user if there's a fee associated

2 files changed, 14 insertions, 4 deletions

diff --git a/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt b/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt
index 24b7936..d866c72 100644
--- a/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt
+++ b/app/src/main/java/net/taler/wallet/history/HistoryEvent.kt
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME
+import net.taler.wallet.ParsedAmount.Companion.parseAmount
 import net.taler.wallet.R
 
 enum class ReserveType {
@@ -298,8 +299,11 @@ class HistoryRefreshedEvent(
      */
     val refreshGroupId: String
 ) : HistoryEvent(timestamp) {
-    override val icon = R.drawable.ic_history_black_24dp
+    override val layout = R.layout.history_payment
+    override val icon = R.drawable.history_refresh
     override val title = R.string.history_event_refreshed
+    override val showToUser =
+        !(parseAmount(amountRefreshedRaw) - parseAmount(amountRefreshedEffective)).isZero()
 }
 
 @JsonTypeName("order-redirected")
diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt
index 5781f4f..7bb8b33 100644
--- a/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt
+++ b/app/src/main/java/net/taler/wallet/history/WalletHistoryAdapter.kt
@@ -109,9 +109,6 @@ internal class GenericHistoryEventViewHolder(v: View) : HistoryEventViewHolder(v
             is HistoryOrderAcceptedEvent -> event.orderShortInfo.summary
             is HistoryOrderRefusedEvent -> event.orderShortInfo.summary
             is HistoryOrderRedirectedEvent -> event.newOrderShortInfo.summary
-            is HistoryRefreshedEvent -> {
-                "${parseAmount(event.amountRefreshedRaw)} - ${parseAmount(event.amountRefreshedEffective)}"
-            }
             else -> ""
         }
     }
@@ -199,6 +196,7 @@ internal class HistoryPaymentViewHolder(v: View) : HistoryEventViewHolder(v) {
         when(event) {
             is HistoryPaymentSentEvent -> bind(event)
             is HistoryPaymentAbortedEvent -> bind(event)
+            is HistoryRefreshedEvent -> bind(event)
         }
     }
 
@@ -212,4 +210,12 @@ internal class HistoryPaymentViewHolder(v: View) : HistoryEventViewHolder(v) {
         amountPaidWithFees.text = "-${parseAmount(event.amountLost)}"
     }
 
+    private fun bind(event: HistoryRefreshedEvent) {
+        title.text = ""
+        val fee =
+            parseAmount(event.amountRefreshedRaw) - parseAmount(event.amountRefreshedEffective)
+        if (fee.isZero()) amountPaidWithFees.text = null
+        else amountPaidWithFees.text = "-$fee"
+    }
+
 }