Reload alias count after user upgrades from more aliases prompt

Fix #2464

Author: wrdhub

src/common/misc/SubscriptionDialogs.ts

@@ -14,7 +14,7 @@ let upgradeDialogShowing = false
 /**
  * Opens a dialog which states that the function is not available in the Free subscription and provides an option to upgrade.
  */
-export async function showNotAvailableForFreeDialog(acceptedPlans: readonly AvailablePlanType[] = NewPaidPlans) {
+export async function showNotAvailableForFreeDialog(acceptedPlans: readonly AvailablePlanType[] = NewPaidPlans): Promise<void> {
 	// upgradeDialogShowing prevents the dialog from being opened multiple times, as could happen when waiting for the wizard to import
 	if (!upgradeDialogShowing) {
 		upgradeDialogShowing = true
@@ -99,8 +99,7 @@ export async function showPlanUpgradeRequiredDialog(acceptedPlans: readonly Avai
 	}
 	const userController = locator.logins.getUserController()
 	if (userController.isFreeAccount()) {
-		showNotAvailableForFreeDialog(acceptedPlans)
-		return false
+		await showNotAvailableForFreeDialog(acceptedPlans)
 	} else if (!userController.isGlobalAdmin()) {
 		Dialog.message("contactAdmin_msg")
 		return false
@@ -114,8 +113,8 @@ export async function showPlanUpgradeRequiredDialog(acceptedPlans: readonly Avai
 			reason = businessPlanRequired ? "pricing.notSupportedByPersonalPlan_msg" : "newPaidPlanRequired_msg"
 		}
 		await showSwitchPlanDialog(userController, acceptedPlans, reason)
-		return acceptedPlans.includes(downcast<AvailablePlanType>(await userController.getPlanType()))
 	}
+	return acceptedPlans.includes(downcast<AvailablePlanType>(await userController.getPlanType()))
 }
 
 export async function showUpgradeWizardOrSwitchSubscriptionDialog(

src/common/settings/mailaddress/AddAliasDialog.ts

@@ -19,7 +19,14 @@ export function showAddAliasDialog(model: MailAddressTableModel, isNewPaidPlan:
 		const hasCustomDomains = domains.some((domain) => !TUTA_MAIL_ADDRESS_DOMAINS.includes(domain.domain))
 		if (model.aliasCount && filterInt(model.aliasCount.usedAliases) >= filterInt(model.aliasCount.totalAliases)) {
 			if (!(isNewPaidPlan && hasCustomDomains)) {
-				model.handleTooManyAliases().catch(ofClass(UpgradeRequiredError, (e) => showPlanUpgradeRequiredDialog(e.plans, e.message)))
+				model.handleTooManyAliases().catch(
+					ofClass(UpgradeRequiredError, async (e) => {
+						const upgraded = await showPlanUpgradeRequiredDialog(e.plans, e.message)
+						if (upgraded) {
+							await model.loadAliasCount()
+						}
+					}),
+				)
 				return
 			}
 		}
@@ -71,7 +78,10 @@ export function showAddAliasDialog(model: MailAddressTableModel, isNewPaidPlan:
 										lang.makeTranslation("confirm_msg", `${lang.get("paidEmailDomainLegacy_msg")}\n${lang.get("changePaidPlan_msg")}`),
 									).then(async (confirmed) => {
 										if (confirmed) {
-											isNewPaidPlan = await showPlanUpgradeRequiredDialog(NewPaidPlans)
+											const upgraded = await showPlanUpgradeRequiredDialog(NewPaidPlans)
+											if (upgraded) {
+												await model.loadAliasCount()
+											}
 										}
 									})
 								}
@@ -114,7 +124,10 @@ async function addAlias(model: MailAddressTableModel, alias: string, senderName:
 
 			return Dialog.message(lang.makeTranslation("confirm_msg", errorMsg))
 		} else if (error instanceof UpgradeRequiredError) {
-			showPlanUpgradeRequiredDialog(error.plans, error.message)
+			const upgraded = await showPlanUpgradeRequiredDialog(error.plans, error.message)
+			if (upgraded) {
+				await model.loadAliasCount()
+			}
 		} else {
 			throw error
 		}

src/common/settings/mailaddress/MailAddressTable.ts

@@ -9,15 +9,15 @@ import { Icons } from "../../gui/base/icons/Icons.js"
 import { showProgressDialog } from "../../gui/dialogs/ProgressDialog.js"
 import { ExpanderButton, ExpanderPanel } from "../../gui/base/Expander.js"
 import { attachDropdown, DropdownButtonAttrs } from "../../gui/base/Dropdown.js"
-import { showNotAvailableForFreeDialog, showPlanUpgradeRequiredDialog } from "../../misc/SubscriptionDialogs.js"
+import { showPlanUpgradeRequiredDialog } from "../../misc/SubscriptionDialogs.js"
 import { assertMainOrNode } from "../../api/common/Env.js"
 import { IconButtonAttrs } from "../../gui/base/IconButton.js"
 import { ButtonSize } from "../../gui/base/ButtonSize.js"
 import { AddressInfo, AddressStatus, MailAddressTableModel } from "./MailAddressTableModel.js"
 import { showAddAliasDialog } from "./AddAliasDialog.js"
 import { locator } from "../../api/main/CommonLocator.js"
 import { UpgradeRequiredError } from "../../api/main/UpgradeRequiredError.js"
-import { UnsubscribeFailureReason } from "../../api/common/TutanotaConstants"
+import { NewPaidPlans, UnsubscribeFailureReason } from "../../api/common/TutanotaConstants"
 
 assertMainOrNode()
 
@@ -87,7 +87,11 @@ export class MailAddressTable implements Component<MailAddressTableAttrs> {
 	private async onAddAlias(attrs: MailAddressTableAttrs) {
 		const userController = locator.logins.getUserController()
 		if (userController.isFreeAccount()) {
-			showNotAvailableForFreeDialog()
+			await showPlanUpgradeRequiredDialog(NewPaidPlans).then((upgraded) => {
+				if (upgraded) {
+					attrs.model.loadAliasCount()
+				}
+			})
 		} else {
 			const isNewPaidPlan = await userController.isNewPaidPlan()
 			showAddAliasDialog(attrs.model, isNewPaidPlan)

src/common/settings/mailaddress/MailAddressTableModel.ts

@@ -179,7 +179,7 @@ export class MailAddressTableModel {
 		this.nameMappings = await this.nameChanger.getSenderNames()
 	}
 
-	private async loadAliasCount() {
+	async loadAliasCount() {
 		this.aliasCount = await this.mailAddressFacade.getAliasCounters(this.userInfo.userGroupInfo.group)
 	}
 

src/common/subscription/SwitchSubscriptionDialog.ts

@@ -28,7 +28,7 @@ import { locator } from "../api/main/CommonLocator"
 import { SwitchAccountTypeService } from "../api/entities/sys/Services.js"
 import { BadRequestError, InvalidDataError, PreconditionFailedError } from "../api/common/error/RestError.js"
 import { PaymentInterval, PriceAndConfigProvider } from "./utils/PriceUtils"
-import { assertNotNull, base64ExtToBase64, base64ToUint8Array, delay, downcast, lazy } from "@tutao/tutanota-utils"
+import { assertNotNull, base64ExtToBase64, base64ToUint8Array, defer, delay, downcast, lazy } from "@tutao/tutanota-utils"
 import { showSwitchToBusinessInvoiceDataDialog } from "./SwitchToBusinessInvoiceDataDialog.js"
 import { getByAbbreviation } from "../api/common/CountryList.js"
 import { formatNameAndAddress } from "../api/common/utils/CommonFormatter.js"
@@ -83,7 +83,9 @@ export async function showSwitchDialog({
 		PriceAndConfigProvider.getInitializedInstance(null, locator.serviceExecutor, null),
 	)
 	const model = new SwitchSubscriptionDialogModel(customer, accountingInfo, await locator.logins.getUserController().getPlanType(), lastBooking)
+	const deferred = defer<void>()
 	const cancelAction = () => {
+		deferred.resolve()
 		dialog.close()
 	}
 
@@ -199,7 +201,7 @@ export async function showSwitchDialog({
 		[PlanType.Unlimited]: createPlanButton(dialog, PlanType.Unlimited, currentPlanInfo, paymentInterval, accountingInfo),
 	}
 	dialog.show()
-	return
+	return deferred.promise
 }
 
 async function onSwitchToFree(customer: Customer, dialog: Dialog, currentPlanInfo: CurrentPlanInfo) {
@@ -505,6 +507,6 @@ async function switchSubscription(targetSubscription: PlanType, dialog: Dialog,
 			throw e
 		}
 	} finally {
-		dialog.close()
+		dialog.onClose()
 	}
 }