From f14c7e5f2a1495613c16bcf1acf74d08fd91fb48 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 24 May 2023 14:09:25 +0200 Subject: wallet-core: remove deprecated txid parsing --- packages/taler-wallet-core/src/operations/withdraw.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'packages/taler-wallet-core/src/operations/withdraw.ts') diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index 2cb0a6253..d59d9fea3 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -118,7 +118,6 @@ import { WALLET_BANK_INTEGRATION_PROTOCOL_VERSION, WALLET_EXCHANGE_PROTOCOL_VERSION, } from "../versions.js"; -import { makeTransactionId } from "./common.js"; import { getExchangeDetails, getExchangePaytoUri, @@ -1456,10 +1455,10 @@ export async function processWithdrawalGroup( if (numKycRequired > 0) { if (kycInfo) { - const txId = makeTransactionId( - TransactionType.Withdrawal, - withdrawalGroup.withdrawalGroupId, - ); + const txId = constructTransactionIdentifier({ + tag: TransactionType.Withdrawal, + withdrawalGroupId: withdrawalGroup.withdrawalGroupId, + }); await checkWithdrawalKycStatus( ws, withdrawalGroup.exchangeBaseUrl, @@ -2050,12 +2049,13 @@ async function processReserveBankStatus( r.wgInfo.bankInfo.timestampBankConfirmed = now; r.status = WithdrawalGroupStatus.PendingQueryingStatus; // FIXME: Notification is deprecated with DD37. + const transactionId = constructTransactionIdentifier({ + tag: TransactionType.Withdrawal, + withdrawalGroupId: r.withdrawalGroupId, + }); ws.notify({ type: NotificationType.WithdrawalGroupBankConfirmed, - transactionId: makeTransactionId( - TransactionType.Withdrawal, - r.withdrawalGroupId, - ), + transactionId, }); } else { logger.info("withdrawal: transfer not yet confirmed by bank"); -- cgit v1.2.3