From 52a1f63e0a8cc2ca78910e8b56326376eb1d75d0 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 21 Feb 2024 14:23:01 +0100 Subject: wallet-core: use cancellation tokens when possible --- packages/taler-wallet-core/src/transactions.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'packages/taler-wallet-core/src/transactions.ts') diff --git a/packages/taler-wallet-core/src/transactions.ts b/packages/taler-wallet-core/src/transactions.ts index 7d54ca980..d7f0c0d18 100644 --- a/packages/taler-wallet-core/src/transactions.ts +++ b/packages/taler-wallet-core/src/transactions.ts @@ -54,8 +54,8 @@ import { import { constructTaskIdentifier, PendingTaskType, - TaskId, TaskIdentifiers, + TaskIdStr, TransactionContext, } from "./common.js"; import { @@ -1622,7 +1622,9 @@ export function parseTransactionIdentifier( } } -function maybeTaskFromTransaction(transactionId: string): TaskId | undefined { +function maybeTaskFromTransaction( + transactionId: string, +): TaskIdStr | undefined { const parsedTx = parseTransactionIdentifier(transactionId); if (!parsedTx) { @@ -1786,6 +1788,9 @@ export async function deleteTransaction( ): Promise { const ctx = await getContextForTransaction(ws, transactionId); await ctx.deleteTransaction(); + if (ctx.taskId) { + ws.taskScheduler.stopShepherdTask(ctx.taskId); + } } export async function abortTransaction( -- cgit v1.2.3