From 400bb2a7d66566955f1dabcd3cfd66ef37179c87 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 22 Jun 2024 01:07:56 +0400 Subject: [PATCH] Paid media improvements --- .../StatisticsUI/Sources/MonetizationBalanceItem.swift | 2 +- submodules/StatisticsUI/Sources/MonetizationUtils.swift | 5 +++-- submodules/StatisticsUI/Sources/StatsOverviewItem.swift | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/submodules/StatisticsUI/Sources/MonetizationBalanceItem.swift b/submodules/StatisticsUI/Sources/MonetizationBalanceItem.swift index 554f802386..b34980807d 100644 --- a/submodules/StatisticsUI/Sources/MonetizationBalanceItem.swift +++ b/submodules/StatisticsUI/Sources/MonetizationBalanceItem.swift @@ -168,7 +168,7 @@ final class MonetizationBalanceItemNode: ListViewItemNode, ItemListItemNode { value = stats.balances.availableBalance == 0 ? "" : "≈\(formatUsdValue(stats.balances.availableBalance, rate: stats.usdRate))" } else if let stats = item.stats as? StarsRevenueStats { amountString = NSAttributedString(string: presentationStringsFormattedNumber(Int32(stats.balances.availableBalance), item.presentationData.dateTimeFormat.groupingSeparator), font: integralFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor) - value = stats.balances.availableBalance == 0 ? "" : "≈\(formatUsdValue(stats.balances.availableBalance, rate: stats.usdRate))" + value = stats.balances.availableBalance == 0 ? "" : "≈\(formatUsdValue(stats.balances.availableBalance, divide: false, rate: stats.usdRate))" isStars = true } else { fatalError() diff --git a/submodules/StatisticsUI/Sources/MonetizationUtils.swift b/submodules/StatisticsUI/Sources/MonetizationUtils.swift index 8abe34e85d..3635540ff7 100644 --- a/submodules/StatisticsUI/Sources/MonetizationUtils.swift +++ b/submodules/StatisticsUI/Sources/MonetizationUtils.swift @@ -9,8 +9,9 @@ func formatAddress(_ address: String) -> String { return address } -func formatUsdValue(_ value: Int64, rate: Double) -> String { - let formattedValue = String(format: "%0.2f", (Double(value) / 1000000000) * rate) +func formatUsdValue(_ value: Int64, divide: Bool = true, rate: Double) -> String { + let normalizedValue: Double = divide ? Double(value) / 1000000000 : Double(value) + let formattedValue = String(format: "%0.2f", normalizedValue * rate) return "$\(formattedValue)" } diff --git a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift index 7b2251ac41..8e72379fdf 100644 --- a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift +++ b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift @@ -221,7 +221,7 @@ private final class ValueItemNode: ASDisplayNode { valueOffset = 17.0 case .stars: iconName = "Premium/Stars/StarMedium" - valueOffset = 19.0 + valueOffset = 21.0 default: iconName = nil } @@ -803,7 +803,7 @@ class StatsOverviewItemNode: ListViewItemNode { item.presentationData, presentationStringsFormattedNumber(Int32(additionalStats.balances.availableBalance), item.presentationData.dateTimeFormat.groupingSeparator), " ", - (additionalStats.balances.availableBalance == 0 ? "" : "≈\(formatUsdValue(additionalStats.balances.availableBalance, rate: additionalStats.usdRate))", .generic), + (additionalStats.balances.availableBalance == 0 ? "" : "≈\(formatUsdValue(additionalStats.balances.availableBalance, divide: false, rate: additionalStats.usdRate))", .generic), .stars ) @@ -813,7 +813,7 @@ class StatsOverviewItemNode: ListViewItemNode { item.presentationData, presentationStringsFormattedNumber(Int32(additionalStats.balances.currentBalance), item.presentationData.dateTimeFormat.groupingSeparator), " ", - (additionalStats.balances.currentBalance == 0 ? "" : "≈\(formatUsdValue(additionalStats.balances.currentBalance, rate: additionalStats.usdRate))", .generic), + (additionalStats.balances.currentBalance == 0 ? "" : "≈\(formatUsdValue(additionalStats.balances.currentBalance, divide: false, rate: additionalStats.usdRate))", .generic), .stars ) @@ -823,7 +823,7 @@ class StatsOverviewItemNode: ListViewItemNode { item.presentationData, presentationStringsFormattedNumber(Int32(additionalStats.balances.overallRevenue), item.presentationData.dateTimeFormat.groupingSeparator), " ", - (additionalStats.balances.overallRevenue == 0 ? "" : "≈\(formatUsdValue(additionalStats.balances.overallRevenue, rate: additionalStats.usdRate))", .generic), + (additionalStats.balances.overallRevenue == 0 ? "" : "≈\(formatUsdValue(additionalStats.balances.overallRevenue, divide: false, rate: additionalStats.usdRate))", .generic), .stars )