Show correct price per year in 2year premium.

john-preston · john-preston · commit eddad6b690f7 · 2025-11-06T22:54:43.000+04:00
Fixes #29961.
diff --git a/Telegram/SourceFiles/api/api_premium_option.cpp b/Telegram/SourceFiles/api/api_premium_option.cpp
@@ -36,7 +36,9 @@ Data::PremiumSubscriptionOption CreateSubscriptionOption(
 		.costNoDiscount = Ui::FillAmountAndCurrency(
 			monthlyAmount * months,
 			currency),
-		.costTotal = Ui::FillAmountAndCurrency(amount, currency),
+		.costPerYear = Ui::FillAmountAndCurrency(
+			amount / float64(months / 12.),
+			currency),
 		.botUrl = botUrl,
 	};
 }
diff --git a/Telegram/SourceFiles/data/data_premium_subscription_option.h b/Telegram/SourceFiles/data/data_premium_subscription_option.h
@@ -15,7 +15,7 @@ struct PremiumSubscriptionOption {
 	QString discount;
 	QString costPerMonth;
 	QString costNoDiscount;
-	QString costTotal;
+	QString costPerYear;
 	QString currency;
 	QString total;
 	QString botUrl;
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -73,17 +73,17 @@ using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 [[nodiscard]] Data::PremiumSubscriptionOptions SubscriptionOptionsForRows(
 		Data::PremiumSubscriptionOptions result) {
 	for (auto &option : result) {
-		const auto total = option.costTotal;
+		const auto perYear = option.costPerYear;
 		const auto perMonth = option.costPerMonth;
 
-		option.costTotal = tr::lng_premium_gift_per(
+		option.costPerYear = tr::lng_premium_gift_per(
 			tr::now,
 			lt_cost,
 			perMonth);
 		option.costPerMonth = tr::lng_premium_subscribe_total(
 			tr::now,
 			lt_cost,
-			total);
+			perYear);
 
 		if (option.duration == tr::lng_months(tr::now, lt_count, 1)) {
 			option.costPerMonth = QString();
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -934,7 +934,7 @@ void AddGiftOptions(
 			return s.replace(kStar, QChar());
 		};
 		const auto &costPerMonthFont = st::shareBoxListItem.nameStyle.font;
-		const auto &costTotalFont = st::normalFont;
+		const auto &costPerYearFont = st::normalFont;
 		const auto costPerMonthIcon = info.costPerMonth.startsWith(kStar)
 			? GenerateStars(costPerMonthFont->height, 1)
 			: QImage();
@@ -951,14 +951,14 @@ void AddGiftOptions(
 					? info.costPerMonth
 					: removedStar(info.costPerMonth)));
 
-		const auto costTotalEntry = [&] {
-			if (!info.costTotal.startsWith(kStar)) {
+		const auto costPerYearEntry = [&] {
+			if (!info.costPerYear.startsWith(kStar)) {
 				return QImage();
 			}
-			const auto text = removedStar(info.costTotal);
-			const auto icon = GenerateStars(costTotalFont->height, 1);
+			const auto text = removedStar(info.costPerYear);
+			const auto icon = GenerateStars(costPerYearFont->height, 1);
 			auto result = QImage(
-				QSize(costTotalFont->spacew + costTotalFont->width(text), 0)
+				QSize(costPerYearFont->spacew + costPerYearFont->width(text), 0)
 					* style::DevicePixelRatio()
 					+ icon.size(),
 				QImage::Format_ARGB32_Premultiplied);
@@ -968,8 +968,8 @@ void AddGiftOptions(
 				auto p = QPainter(&result);
 				p.drawImage(0, 0, icon);
 				p.setPen(st::windowSubTextFg);
-				p.setFont(costTotalFont);
-				auto copy = info.costTotal;
+				p.setFont(costPerYearFont);
+				auto copy = info.costPerYear;
 				p.drawText(
 					Rect(result.size() / style::DevicePixelRatio()),
 					text,
@@ -1077,12 +1077,12 @@ void AddGiftOptions(
 					: (costPerMonthFont->spacew
 						+ costPerMonthIcon.width()
 							/ style::DevicePixelRatio());
-				const auto costTotalWidth = costTotalFont->width(
-					info.costTotal);
+				const auto costPerYearWidth = costPerYearFont->width(
+					info.costPerYear);
 				const auto pos = perRect.translated(left, 0).topLeft();
 				const auto availableWidth = row->width()
 					- pos.x()
-					- costTotalWidth;
+					- costPerYearWidth;
 				costPerMonthLabel->draw(p, {
 					.position = pos,
 					.outerWidth = availableWidth,
@@ -1094,16 +1094,16 @@ void AddGiftOptions(
 
 			const auto totalRect = row->rect()
 				- QMargins(0, 0, st.rowMargins.right(), 0);
-			if (costTotalEntry.isNull()) {
-				p.setFont(costTotalFont);
-				p.drawText(totalRect, info.costTotal, style::al_right);
+			if (costPerYearEntry.isNull()) {
+				p.setFont(costPerYearFont);
+				p.drawText(totalRect, info.costPerYear, style::al_right);
 			} else {
-				const auto size = costTotalEntry.size()
+				const auto size = costPerYearEntry.size()
 					/ style::DevicePixelRatio();
 				p.drawImage(
 					totalRect.width() - size.width(),
 					(row->height() - size.height()) / 2,
-					costTotalEntry);
+					costPerYearEntry);
 			}
 		}, row->lifetime());
 
