commit 0bfb22d46bfab359950913b59da44d9768d06298
parent 988f551fa38eb48c52b82af897eb1db93826953d
Author: Florian Dold <florian@dold.me>
Date: Fri, 4 Oct 2024 15:27:46 +0200
wallet-core: rename getTransactionsV2 filter argument
Just to be more compatible with the old request
Diffstat:
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/packages/taler-util/src/types-taler-wallet-transactions.ts b/packages/taler-util/src/types-taler-wallet-transactions.ts
@@ -149,7 +149,7 @@ export interface GetTransactionsV2Request {
*
* If not specified, all transactions are returned.
*/
- filterState?: "final" | "nonfinal" | "done";
+ filterByState?: "final" | "nonfinal" | "done";
}
export interface TransactionState {
@@ -859,7 +859,7 @@ export const codecForGetTransactionsV2Request =
.property("offsetTimestamp", codecOptional(codecForPreciseTimestamp))
.property("limit", codecOptional(codecForNumber()))
.property(
- "filterState",
+ "filterByState",
codecOptional(
codecForEither(
codecForConstString("final"),
diff --git a/packages/taler-wallet-core/src/transactions.ts b/packages/taler-wallet-core/src/transactions.ts
@@ -76,7 +76,10 @@ import { WithdrawTransactionContext } from "./withdraw.js";
const logger = new Logger("taler-wallet-core:transactions.ts");
function shouldSkipCurrency(
- transactionsRequest: TransactionsRequest | undefined,
+ transactionsRequest:
+ | TransactionsRequest
+ | GetTransactionsV2Request
+ | undefined,
currency: string,
exchangesInTransaction: string[],
): boolean {
@@ -104,7 +107,6 @@ function shouldSkipCurrency(
assertUnreachable(transactionsRequest.scopeInfo);
}
}
- // FIXME: remove next release
if (transactionsRequest?.currency) {
return (
transactionsRequest.currency.toLowerCase() !== currency.toLowerCase()
@@ -191,7 +193,7 @@ function checkFilterIncludes(
let included: boolean;
- const filter = req?.filterState;
+ const filter = req?.filterByState;
switch (filter) {
case "done":
included =