summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet/transactions
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-05-14 14:13:18 -0300
committerTorsten Grote <t@grobox.de>2020-05-15 14:26:42 -0300
commit69093aa9055da501fd14103ac772d730850cb7b4 (patch)
tree4886bd05b7790df295902ed44fcca93146fd06fc /wallet/src/main/java/net/taler/wallet/transactions
parent171a1ae228b801d5c0d54c6c7e7ad8aa458d6bce (diff)
downloadtaler-android-69093aa9055da501fd14103ac772d730850cb7b4.tar.gz
taler-android-69093aa9055da501fd14103ac772d730850cb7b4.tar.bz2
taler-android-69093aa9055da501fd14103ac772d730850cb7b4.zip
[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.
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/transactions')
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionManager.kt1
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt2
2 files changed, 1 insertions, 2 deletions
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<TransactionsResult>()
val transactions: LiveData<TransactionsResult> = 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