Skip to content

fix(auth): brand login mail by login source instead of account history #3846

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 2 commits into from
Jun 9, 2026
+8 −3
Merged

fix(auth): brand login mail by login source instead of account history #3846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91029d
fix(auth): brand login mail by login source instead of account history
joshuakrueger-dfx Jun 9, 2026
bad89d6
fix(auth): always resolve a concrete login wallet for mail branding
joshuakrueger-dfx Jun 9, 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
11 changes: 8 additions & 3 deletions src/subdomains/generic/user/models/auth/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,12 @@ export class AuthService {
const ipCountry = this.geoLocationService.getCountry(userIp);
const language = await this.languageService.getLanguageByCountry(ipCountry);

// wallet the login originated from - determines mail branding (e.g. DFX vs. RealUnit);
// always resolve to a concrete wallet so branding follows the login source and never falls back to account history
const loginWallet =
(dto.wallet && (await this.walletService.getByIdOrName(undefined, dto.wallet))) ||
(await this.walletService.getDefault());

const userData =
(await this.userDataService
.getUsersByMail(dto.mail)
Expand All @@ -268,9 +274,7 @@ export class AuthService {
mail: dto.mail,
language: dto.language ?? language,
status: UserDataStatus.KYC_ONLY,
wallet: dto.wallet
? await this.walletService.getByIdOrName(undefined, dto.wallet)
: await this.walletService.getDefault(),
wallet: loginWallet,
}));

if (dto.recommendationCode) await this.confirmRecommendationCode(dto.recommendationCode, userData);
Expand Down Expand Up @@ -301,6 +305,7 @@ export class AuthService {
context: MailContext.LOGIN,
input: {
userData,
wallet: loginWallet,
title: `${MailTranslationKey.LOGIN}.title`,
salutation: { key: `${MailTranslationKey.LOGIN}.salutation` },
texts: [
Expand Down