Don't show incorrect mail address info on legacy plans

It is not true that legacy plans can have unlimited custom domains. Make it not display anything here to prevent confusion. Fixes #6540
tutao · Feb 26, 2024 · c22089f · c22089f
1 parent 4f49170
commit c22089f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/src/misc/TranslationKey.ts b/src/misc/TranslationKey.ts
@@ -1625,3 +1625,4 @@ export type TranslationKeyType =
 	| "yourMessage_label"
 	| "you_label"
 	| "emptyString_msg"
+	| "mailAddressInfoLegacy_msg"
diff --git a/src/settings/mailaddress/MailAddressTable.ts b/src/settings/mailaddress/MailAddressTable.ts
@@ -17,7 +17,6 @@ import { AddressInfo, AddressStatus, MailAddressTableModel } from "./MailAddress
 import { showAddAliasDialog } from "./AddAliasDialog.js"
 import { locator } from "../../api/main/MainLocator.js"
 import { UpgradeRequiredError } from "../../api/main/UpgradeRequiredError.js"
-import { PlanType } from "../../api/common/TutanotaConstants.js"
 
 assertMainOrNode()
 
@@ -78,7 +77,7 @@ export class MailAddressTable implements Component<MailAddressTableAttrs> {
 								"{totalAmount}": model.aliasCount.totalAliases,
 							}),
 						),
-						m(".small.mt-s", lang.get("mailAddressInfo_msg")),
+						m(".small.mt-s", lang.get(model.aliasLimitIncludesCustomDomains() ? "mailAddressInfoLegacy_msg" : "mailAddressInfo_msg")),
 				  ]
 				: null,
 		]

diff --git a/src/settings/mailaddress/MailAddressTableModel.ts b/src/settings/mailaddress/MailAddressTableModel.ts
@@ -43,10 +43,16 @@ export interface MailAddressNameChanger {
 /** Model for showing the list of mail addresses and optionally adding more, enabling/disabling/setting names for them. */
 export class MailAddressTableModel {
 	private nameMappings: AddressToName | null = null
+	private onLegacyPlan: boolean = false
 	aliasCount: MailAddressAliasServiceReturn | null = null
 
 	init: () => Promise<void> = lazyMemoized(async () => {
 		this.eventController.addEntityListener(this.entityEventsReceived)
+
+		// important: "not on legacy plan" is true for free plans
+		const userController = this.logins.getUserController()
+		this.onLegacyPlan = userController.isLegacyPlan(await userController.getPlanType())
+
 		await this.loadNames()
 		this.redraw()
 		await this.loadAliasCount()
@@ -72,6 +78,10 @@ export class MailAddressTableModel {
 		return this.logins.getUserController().isGlobalAdmin()
 	}
 
+	aliasLimitIncludesCustomDomains(): boolean {
+		return this.onLegacyPlan
+	}
+
 	addresses(): AddressInfo[] {
 		const { nameMappings } = this
 		if (nameMappings == null) {

diff --git a/src/translations/de.ts b/src/translations/de.ts
@@ -1643,6 +1643,7 @@ export default {
 		"yourCalendars_label": "Deine Kalender",
 		"yourFolders_action": "DEINE ORDNER",
 		"yourMessage_label": "Deine Nachricht",
-		"you_label": "Du"
+		"you_label": "Du",
+		"mailAddressInfoLegacy_msg": "Deaktivierte E-Mail-Adressen können einer anderen Mailbox innerhalb deines Kontos zugewiesen werden."
 	}
 }
diff --git a/src/translations/de_sie.ts b/src/translations/de_sie.ts
@@ -1643,6 +1643,7 @@ export default {
 		"yourCalendars_label": "Deine Kalender",
 		"yourFolders_action": "Ihre ORDNER",
 		"yourMessage_label": "Ihre Nachricht",
-		"you_label": "Sie"
+		"you_label": "Sie",
+		"mailAddressInfoLegacy_msg": "Deaktivierte E-Mail-Adressen können einer anderen Mailbox innerhalb Ihres Kontos zugewiesen werden."
 	}
 }
diff --git a/src/translations/en.ts b/src/translations/en.ts
@@ -1639,6 +1639,7 @@ export default {
 		"yourCalendars_label": "Your calendars",
 		"yourFolders_action": "YOUR FOLDERS",
 		"yourMessage_label": "Your message",
-		"you_label": "You"
+		"you_label": "You",
+		"mailAddressInfoLegacy_msg": "Disabled email addresses can be reassigned to another user or mailbox within your account."
 	}
 }