From e52ee8f55326de402a7ad421c396eb6c81a79a68 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 2 Apr 2020 15:12:09 -0300
Subject: [wallet] Show withdraw fee

---
 .../java/net/taler/wallet/withdraw/WithdrawManager.kt    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt')

diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
index e252627..26515a5 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
@@ -32,12 +32,14 @@ sealed class WithdrawStatus {
         val tosText: String,
         val tosEtag: String,
         val amount: Amount,
+        val fee: Amount,
         val suggestedExchange: String
     ) : WithdrawStatus()
 
     data class ReceivedDetails(
         val talerWithdrawUri: String,
         val amount: Amount,
+        val fee: Amount,
         val suggestedExchange: String
     ) : WithdrawStatus()
 
@@ -131,6 +133,10 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) {
             val ei = result.getJSONObject("exchangeWithdrawDetails")
             val termsOfServiceAccepted = ei.getBoolean("termsOfServiceAccepted")
 
+            val withdrawFee = Amount.fromJsonObject(ei.getJSONObject("withdrawFee"))
+            val overhead = Amount.fromJsonObject(ei.getJSONObject("overhead"))
+            val fee = withdrawFee + overhead
+
             if (!termsOfServiceAccepted) {
                 val exchange = ei.getJSONObject("exchangeInfo")
                 val tosText = exchange.getString("termsOfServiceText")
@@ -138,10 +144,8 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) {
                 withdrawStatus.postValue(
                     WithdrawStatus.TermsOfServiceReviewRequired(
                         status.talerWithdrawUri,
-                        selectedExchange,
-                        tosText,
-                        tosEtag,
-                        amount,
+                        selectedExchange, tosText, tosEtag,
+                        amount, fee,
                         suggestedExchange
                     )
                 )
@@ -149,7 +153,7 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) {
                 withdrawStatus.postValue(
                     ReceivedDetails(
                         status.talerWithdrawUri,
-                        amount,
+                        amount, fee,
                         suggestedExchange
                     )
                 )
@@ -195,7 +199,7 @@ class WithdrawManager(private val walletBackendApi: WalletBackendApi) {
                 Log.e(TAG, "Error acceptExchangeTermsOfService ${result.toString(4)}")
                 return@sendRequest
             }
-            val status = ReceivedDetails(s.talerWithdrawUri, s.amount, s.suggestedExchange)
+            val status = ReceivedDetails(s.talerWithdrawUri, s.amount, s.fee, s.suggestedExchange)
             withdrawStatus.postValue(status)
         }
     }
-- 
cgit v1.2.3