Skip to content

Release: develop -> main #3225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TaprootFreak merged 1 commit into from
Feb 19, 2026
Merged

Release: develop -> main #3225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/subdomains/supporting/log/log-job.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ export class LogJobService {
const olkyBank = await this.bankService.getBankInternal(IbanBankName.OLKY, 'EUR');
const yapealEurBank = await this.bankService.getBankInternal(IbanBankName.YAPEAL, 'EUR');
const yapealChfBank = await this.bankService.getBankInternal(IbanBankName.YAPEAL, 'CHF');
const eurBankIbans = [yapealEurBank.iban, olkyBank.iban];

// pending balances
const pendingOrders = await this.liquidityManagementPipelineService.getPendingTx();
Expand Down Expand Up @@ -384,9 +385,9 @@ export class LogJobService {
eurReceiverExchangeTx,
);

// EUR: Yapeal -> Scrypt
// EUR: Bank -> Scrypt
const eurSenderScryptBankTx = recentScryptBankTx.filter(
(b) => b.accountIban === yapealEurBank.iban && b.creditDebitIndicator === BankTxIndicator.DEBIT,
(b) => eurBankIbans.includes(b.accountIban) && b.creditDebitIndicator === BankTxIndicator.DEBIT,
);
const eurReceiverScryptExchangeTx = recentScryptExchangeTx.filter(
(k) => k.type === ExchangeTxType.DEPOSIT && k.status === 'ok' && k.currency === 'EUR',
Expand All @@ -400,15 +401,15 @@ export class LogJobService {
(b) => b.accountIban === yapealChfBank.iban && b.creditDebitIndicator === BankTxIndicator.CREDIT,
);

// EUR: Scrypt -> Yapeal
// EUR: Scrypt -> Bank
const eurSenderScryptExchangeTx = recentScryptExchangeTx.filter(
(k) => k.type === ExchangeTxType.WITHDRAWAL && k.status === 'ok' && k.currency === 'EUR',
);
const eurReceiverScryptBankTx = recentScryptBankTx.filter(
(b) => b.accountIban === yapealEurBank.iban && b.creditDebitIndicator === BankTxIndicator.CREDIT,
(b) => eurBankIbans.includes(b.accountIban) && b.creditDebitIndicator === BankTxIndicator.CREDIT,
);

// sender and receiver data for Yapeal -> Scrypt
// sender and receiver data for Bank -> Scrypt
const { sender: recentChfYapealScryptTx, receiver: recentChfBankTxScrypt } = this.filterSenderPendingList(
chfSenderScryptBankTx,
chfReceiverScryptExchangeTx,
Expand All @@ -418,7 +419,7 @@ export class LogJobService {
eurReceiverScryptExchangeTx,
);

// sender and receiver data for Scrypt -> Yapeal
// sender and receiver data for Scrypt -> Bank
const { sender: recentChfScryptYapealTx, receiver: recentChfScryptBankTx } = this.filterSenderPendingList(
chfSenderScryptExchangeTx,
chfReceiverScryptBankTx,
Expand Down
Loading