summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2023-10-17 10:15:41 -0300
committerTorsten Grote <t@grobox.de>2023-10-17 10:30:56 -0300
commit118e5600f76993d8f2afddc3435e7619e3d58c73 (patch)
tree9d1b17261b2d1ab813e740d7a1f46e3e1e481388 /wallet/src/main/java/net/taler
parent5801fe2ea15a468c241d3552ff26af4fa20e0b58 (diff)
downloadtaler-android-118e5600f76993d8f2afddc3435e7619e3d58c73.tar.gz
taler-android-118e5600f76993d8f2afddc3435e7619e3d58c73.tar.bz2
taler-android-118e5600f76993d8f2afddc3435e7619e3d58c73.zip
[wallet] update wallet-core to dev.33
Diffstat (limited to 'wallet/src/main/java/net/taler')
-rw-r--r--wallet/src/main/java/net/taler/wallet/MainViewModel.kt3
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt3
2 files changed, 4 insertions, 2 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
index a2c8059..15fe7e4 100644
--- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
+++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
@@ -204,8 +204,7 @@ class MainViewModel(
api.request<Unit>("runIntegrationTestV2") {
put("amountToWithdraw", "KUDOS:42")
put("amountToSpend", "KUDOS:23")
- put("bankBaseUrl", "https://bank.demo.taler.net/")
- put("bankAccessApiBaseUrl", "https://bank.demo.taler.net/")
+ put("corebankApiBaseUrl", "https://bank.demo.taler.net/")
put("exchangeBaseUrl", "https://exchange.demo.taler.net/")
put("merchantBaseUrl", "https://backend.demo.taler.net/")
put("merchantAuthToken", "secret-token:sandbox")
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt
index 64e23c9..ae581ad 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt
@@ -70,6 +70,9 @@ enum class TransactionMajorState {
@SerialName("deleted")
Deleted,
+ @SerialName("expired")
+ Expired,
+
@SerialName("unknown")
Unknown;
}