Skip to content

Release: develop -> main #2944

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
davidleomay merged 3 commits into from
Jan 15, 2026
Merged

Release: develop -> main #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ecb79d
fix: fixed circular update dependency (#2943)
davidleomay Jan 15, 2026
043dfc6
fix: skip input mail for Bitcoin purchases with txId (#2941)
TaprootFreak Jan 15, 2026
01ad0f1
Improve circular dependency fix (#2945)
davidleomay Jan 15, 2026
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
4 changes: 3 additions & 1 deletion src/subdomains/generic/kyc/services/kyc.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,9 @@ export class KycService {

async trySetMail(user: UserData, step: KycStep, mail: string): Promise<UpdateResult<KycStep>> {
try {
user = await this.userDataService.trySetUserMail(user, mail);
if (user.mail !== mail) {
await this.userDataService.trySetUserMail(user, mail);
}
return step.complete({ mail });
} catch (e) {
const error = (e as Error).message?.includes('account merge request sent')
Expand Down
8 changes: 7 additions & 1 deletion src/subdomains/supporting/payment/services/transaction-notification.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class TransactionNotificationService {
},
relations: {
bankTx: true,
buyCrypto: true,
buyCrypto: { buy: { asset: true } },
buyFiat: true,
userData: { wallet: true },
user: { wallet: true },
Expand All @@ -59,6 +59,12 @@ export class TransactionNotificationService {
)
continue;

// Skip input mail for Bitcoin purchases that already have txId (will receive BuyCryptoCompleted mail directly)
if (entity.buyCrypto?.txId && entity.buyCrypto?.buy?.asset?.uniqueName === 'Bitcoin/BTC') {
await this.repo.update(...entity.mailSent());
continue;
}

if (entity.userData?.mail)
await this.notificationService.sendMail({
type: MailType.USER_V2,
Expand Down
Loading