From 69093aa9055da501fd14103ac772d730850cb7b4 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 14 May 2020 14:13:18 -0300 Subject: [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. --- .../src/main/java/net/taler/wallet/transactions/TransactionManager.kt | 1 + wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/transactions') diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt index 81d53b9..c6c1ecd 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt @@ -45,6 +45,7 @@ class TransactionManager( var selectedCurrency: String? = null var selectedTransaction: Transaction? = null + // TODO maybe cache transactions per currency? private val mTransactions = MutableLiveData() val transactions: LiveData = mTransactions 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 7310142..7f573ef 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt @@ -73,9 +73,7 @@ class TransactionWithdrawal( val exchangeBaseUrl: String = "unknown", // TODO fix in wallet-core val confirmed: Boolean, val bankConfirmationUrl: String?, - @JsonProperty("amountEffective") // TODO remove when fixed in wallet-core amountRaw: Amount, - @JsonProperty("amountRaw") // TODO remove when fixed in wallet-core amountEffective: Amount? ) : Transaction(transactionId, timestamp, pending, amountRaw, amountEffective) { override val icon = R.drawable.transaction_withdrawal -- cgit v1.2.3