From 5d0ad07def92410663c54dcba5693090fbb19385 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 12 Apr 2024 11:29:14 -0300 Subject: show contract terms in dev mode --- packages/taler-wallet-core/src/pay-merchant.ts | 2 +- packages/taler-wallet-core/src/wallet.ts | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'packages/taler-wallet-core') diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts index 2a01481b0..80e88337e 100644 --- a/packages/taler-wallet-core/src/pay-merchant.ts +++ b/packages/taler-wallet-core/src/pay-merchant.ts @@ -2159,7 +2159,7 @@ async function processPurchasePay( p.payInfo.payCoinSelectionUid = encodeCrock(getRandomBytes(16)); p.purchaseStatus = PurchaseStatus.PendingPaying; await tx.purchases.put(p); - const sel = p.payInfo.payCoinSelection; + await spendCoins(wex, tx, { //`txn:proposal:${p.proposalId}` allocationId: constructTransactionIdentifier({ diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts index 2666e6eb7..fb5a93693 100644 --- a/packages/taler-wallet-core/src/wallet.ts +++ b/packages/taler-wallet-core/src/wallet.ts @@ -952,7 +952,18 @@ async function dispatchRequestInternal( } case WalletApiOperation.GetContractTermsDetails: { const req = codecForGetContractTermsDetails().decode(payload); - return getContractTermsDetails(wex, req.proposalId); + if (req.proposalId) { + // FIXME: deprecated path + return getContractTermsDetails(wex, req.proposalId); + } + if (req.transactionId) { + const parsedTx = parseTransactionIdentifier(req.transactionId); + if (parsedTx?.tag === TransactionType.Payment) { + return getContractTermsDetails(wex, parsedTx.proposalId); + } + throw Error("transactionId is not a payment transaction"); + } + throw Error("transactionId missing"); } case WalletApiOperation.RetryPendingNow: { logger.error("retryPendingNow currently not implemented"); -- cgit v1.2.3