1 files changed, 7 insertions, 10 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
index bff55ff..5bd2b0b 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
@@ -25,7 +25,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import net.taler.common.Amount
-import net.taler.common.QrCodeManager
 import net.taler.common.Timestamp
 import net.taler.wallet.TAG
 import net.taler.wallet.backend.TalerErrorCode.UNKNOWN
@@ -95,8 +94,7 @@ class PeerManager(
                     put("purse_expiration", JSONObject(Json.encodeToString(expiry)))
                 })
             }.onSuccess {
-                val qrCode = QrCodeManager.makeQrCode(it.talerUri)
-                _outgoingPullState.value = OutgoingResponse(it.talerUri, qrCode)
+                _outgoingPullState.value = OutgoingResponse(it.transactionId)
             }.onError { error ->
                 Log.e(TAG, "got initiatePeerPullCredit error result $error")
                 _outgoingPullState.value = OutgoingError(error)
@@ -130,7 +128,7 @@ class PeerManager(
         _outgoingPushState.value = OutgoingCreating
         scope.launch(Dispatchers.IO) {
             val expiry = Timestamp.fromMillis(System.currentTimeMillis() + HOURS.toMillis(expirationHours))
-            api.request("initiatePeerPushDebit", InitiatePeerPullCreditResponse.serializer()) {
+            api.request("initiatePeerPushDebit", InitiatePeerPushDebitResponse.serializer()) {
                 put("amount", amount.toJSONString())
                 put("partialContractTerms", JSONObject().apply {
                     put("amount", amount.toJSONString())
@@ -138,8 +136,7 @@ class PeerManager(
                     put("purse_expiration", JSONObject(Json.encodeToString(expiry)))
                 })
             }.onSuccess { response ->
-                val qrCode = QrCodeManager.makeQrCode(response.talerUri)
-                _outgoingPushState.value = OutgoingResponse(response.talerUri, qrCode)
+                _outgoingPushState.value = OutgoingResponse(response.transactionId)
             }.onError { error ->
                 Log.e(TAG, "got initiatePeerPushDebit error result $error")
                 _outgoingPushState.value = OutgoingError(error)
@@ -161,7 +158,7 @@ class PeerManager(
                     amountRaw = response.amountRaw,
                     amountEffective = response.amountEffective,
                     contractTerms = response.contractTerms,
-                    id = response.peerPullPaymentIncomingId,
+                    id = response.transactionId,
                 )
             }.onError { error ->
                 Log.e(TAG, "got preparePeerPullDebit error result $error")
@@ -174,7 +171,7 @@ class PeerManager(
         _incomingPullState.value = IncomingAccepting(terms)
         scope.launch(Dispatchers.IO) {
             api.request<Unit>("confirmPeerPullDebit") {
-                put("peerPullPaymentIncomingId", terms.id)
+                put("transactionId", terms.id)
             }.onSuccess {
                 _incomingPullState.value = IncomingAccepted
             }.onError { error ->
@@ -194,7 +191,7 @@ class PeerManager(
                     amountRaw = response.amountRaw,
                     amountEffective = response.amountEffective,
                     contractTerms = response.contractTerms,
-                    id = response.peerPushPaymentIncomingId,
+                    id = response.transactionId,
                 )
             }.onError { error ->
                 Log.e(TAG, "got preparePeerPushCredit error result $error")
@@ -207,7 +204,7 @@ class PeerManager(
         _incomingPushState.value = IncomingAccepting(terms)
         scope.launch(Dispatchers.IO) {
             api.request<Unit>("confirmPeerPushCredit") {
-                put("peerPushPaymentIncomingId", terms.id)
+                put("transactionId", terms.id)
             }.onSuccess {
                 _incomingPushState.value = IncomingAccepted
             }.onError { error ->