From f07436aa4910114a514235fb17879411dae0a555 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 24 Nov 2021 08:55:37 -0300 Subject: new exchange-added notifiaction and including tos information in the wxApi.listExchange api --- packages/taler-wallet-core/src/operations/exchanges.ts | 13 ++++++++----- packages/taler-wallet-core/src/operations/withdraw.ts | 13 +++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) (limited to 'packages/taler-wallet-core/src/operations') diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index 638af813a..a10378a8c 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -494,11 +494,11 @@ async function updateExchangeFromUrlImpl( tosFound !== undefined ? tosFound : await downloadExchangeWithTermsOfService( - baseUrl, - ws.http, - timeout, - "text/plain", - ); + baseUrl, + ws.http, + timeout, + "text/plain", + ); let recoupGroupId: string | undefined = undefined; @@ -657,6 +657,9 @@ async function updateExchangeFromUrlImpl( logger.trace("done updating exchange info in database"); + ws.notify({ + type: NotificationType.ExchangeAdded, + }); return { exchange: updated.exchange, exchangeDetails: updated.exchangeDetails, diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index a5a8653c6..979bd0e53 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -218,7 +218,7 @@ export function selectWithdrawalDenominations( for (const d of denoms) { let count = 0; const cost = Amounts.add(d.value, d.feeWithdraw).amount; - for (;;) { + for (; ;) { if (Amounts.cmp(remaining, cost) < 0) { break; } @@ -746,8 +746,7 @@ export async function updateWithdrawalDenoms( denom.verificationStatus === DenominationVerificationStatus.Unverified ) { logger.trace( - `Validating denomination (${current + 1}/${ - denominations.length + `Validating denomination (${current + 1}/${denominations.length }) signature of ${denom.denomPubHash}`, ); const valid = await ws.cryptoApi.isValidDenom( @@ -997,7 +996,7 @@ export async function getExchangeWithdrawalInfo( ) { console.warn( `wallet's support for exchange protocol version ${WALLET_EXCHANGE_PROTOCOL_VERSION} might be outdated ` + - `(exchange has ${exchangeDetails.protocolVersion}), checking for updates`, + `(exchange has ${exchangeDetails.protocolVersion}), checking for updates`, ); } } @@ -1075,6 +1074,12 @@ export async function getWithdrawalDetailsForUri( exchanges.push({ exchangeBaseUrl: details.exchangeBaseUrl, currency: details.currency, + tos: { + acceptedVersion: details.termsOfServiceAcceptedEtag, + currentVersion: details.termsOfServiceLastEtag, + contentType: details.termsOfServiceContentType, + content: details.termsOfServiceText, + }, paytoUris: details.wireInfo.accounts.map((x) => x.payto_uri), }); } -- cgit v1.2.3